-/* $Id: config.c,v 1.5 2007-01-08 18:32:35 quinn Exp $ */
+/* $Id: config.c,v 1.13 2007-01-15 16:56:51 quinn Exp $ */
#include <string.h>
{
xmlNode *n;
struct conf_service *r = nmem_malloc(nmem, sizeof(struct conf_service));
- int num_metadata = 0;
int md_node = 0;
+ int sk_node = 0;
- // Allocate array of conf metadata structs, if necessary
+ r->num_sortkeys = r->num_metadata = 0;
+ // Allocate array of conf metadata and sortkey tructs, if necessary
for (n = node->children; n; n = n->next)
if (n->type == XML_ELEMENT_NODE && !strcmp(n->name, "metadata"))
- num_metadata++;
- if (num_metadata)
- r->metadata = nmem_malloc(nmem, sizeof(struct conf_metadata) * num_metadata);
- r->num_metadata = num_metadata;
+ {
+ xmlChar *sortkey = xmlGetProp(n, "sortkey");
+ r->num_metadata++;
+ if (sortkey && strcmp(sortkey, "no"))
+ r->num_sortkeys++;
+ xmlFree(sortkey);
+ }
+ if (r->num_metadata)
+ r->metadata = nmem_malloc(nmem, sizeof(struct conf_metadata) * r->num_metadata);
+ else
+ r->metadata = 0;
+ if (r->num_sortkeys)
+ r->sortkeys = nmem_malloc(nmem, sizeof(struct conf_sortkey) * r->num_sortkeys);
+ else
+ r->sortkeys = 0;
for (n = node->children; n; n = n->next)
{
xmlChar *merge = xmlGetProp(n, "merge");
xmlChar *type = xmlGetProp(n, "type");
xmlChar *termlist = xmlGetProp(n, "termlist");
+ xmlChar *rank = xmlGetProp(n, "rank");
if (!name)
{
else
md->termlist = 0;
+ if (rank)
+ md->rank = atoi(rank);
+ else
+ md->rank = 0;
+
if (type)
{
if (!strcmp(type, "generic"))
md->type = Metadata_type_generic;
- else if (!strcmp(type, "integer"))
- md->type = Metadata_type_integer;
else if (!strcmp(type, "year"))
md->type = Metadata_type_year;
else
return 0;
}
}
- md->type = Metadata_type_generic;
-
- if (sortkey)
- {
- if (!strcmp(sortkey, "no"))
- md->sortkey = Metadata_sortkey_no;
- else if (!strcmp(sortkey, "numeric"))
- md->sortkey = Metadata_sortkey_numeric;
- else if (!strcmp(sortkey, "range"))
- md->sortkey = Metadata_sortkey_range;
- else if (!strcmp(sortkey, "skiparticle"))
- md->sortkey = Metadata_sortkey_skiparticle;
- else
- {
- yaz_log(YLOG_FATAL, "Unknown sortkey in metadata element: %s", sortkey);
- return 0;
- }
- }
else
- md->sortkey = Metadata_sortkey_no;
+ md->type = Metadata_type_generic;
if (merge)
{
else
md->merge = Metadata_merge_no;
+ if (sortkey && strcmp(sortkey, "no"))
+ {
+ struct conf_sortkey *sk = &r->sortkeys[sk_node];
+ if (md->merge == Metadata_merge_no)
+ {
+ yaz_log(YLOG_FATAL, "Can't specify sortkey on a non-merged field");
+ return 0;
+ }
+ if (!strcmp(sortkey, "numeric"))
+ sk->type = Metadata_sortkey_numeric;
+ else if (!strcmp(sortkey, "skiparticle"))
+ sk->type = Metadata_sortkey_skiparticle;
+ else
+ {
+ yaz_log(YLOG_FATAL, "Unknown sortkey in metadata element: %s", sortkey);
+ return 0;
+ }
+ sk->name = md->name;
+ md->sortkey_offset = sk_node;
+ sk_node++;
+ }
+ else
+ md->sortkey_offset = -1;
+
xmlFree(name);
xmlFree(brief);
xmlFree(sortkey);
xmlFree(merge);
xmlFree(termlist);
+ xmlFree(rank);
md_node++;
}
else
yaz_log(YLOG_WARN, "Missing name in 'nativesyntax' element");
return 0;
}
+ if (encoding)
+ r->native_encoding = encoding;
if (!strcmp(name, "iso2709"))
{
r->native_syntax = Nativesyn_iso2709;
// Set a few defaults, too
r->native_format = Nativeform_marc21;
r->native_mapto = Nativemapto_marcxml;
- r->native_encoding = "marc-8";
+ if (!r->native_encoding)
+ r->native_encoding = "marc-8";
setup_marc(r);
}
else if (!strcmp(name, "xml"))
return 0;
}
}
- if (encoding)
- r->native_encoding = encoding;
if (mapto)
{
if (!strcmp(mapto, "marcxml"))
xmlChar *charset = xmlGetProp(n, "charset");
xmlChar *format = xmlGetProp(n, "format");
xmlChar *stylesheet = xmlGetProp(n, "stylesheet");
- bzero(m, sizeof(*m));
+ memset(m, 0, sizeof(*m));
if (type)
{
if (!strcmp(type, "xslt"))
int read_config(const char *fname)
{
- xmlDoc *doc = xmlReadFile(fname, NULL, 0);
+ xmlDoc *doc = xmlParseFile(fname);
const char *p;
if (!nmem) // Initialize
yaz_log(YLOG_FATAL, "Failed to read %s", fname);
exit(1);
}
- if ((p = rindex(fname, '/')))
+ if ((p = strrchr(fname, '/')))
{
int len = p - fname;
strncpy(confdir, fname, len);