X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconfig.c;h=3ceb42715b17e4020def9aa1ecf8200c5190cf77;hb=bec266c19b530f61fa576d2b27198ada7d7f5fe3;hp=46c3f64f82f3694769b96e211ac4e2f9a7a3b8f7;hpb=77b4d51d81340f3374ae8a97aea0177a0fbcd336;p=pazpar2-moved-to-github.git

diff --git a/src/config.c b/src/config.c
index 46c3f64..3ceb427 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,4 +1,4 @@
-/* $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>
 
@@ -30,16 +30,28 @@ static struct conf_service *parse_service(xmlNode *node)
 {
     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)
     {
@@ -54,6 +66,7 @@ static struct conf_service *parse_service(xmlNode *node)
             xmlChar *merge = xmlGetProp(n, "merge");
             xmlChar *type = xmlGetProp(n, "type");
             xmlChar *termlist = xmlGetProp(n, "termlist");
+            xmlChar *rank = xmlGetProp(n, "rank");
 
             if (!name)
             {
@@ -87,12 +100,15 @@ static struct conf_service *parse_service(xmlNode *node)
             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
@@ -101,26 +117,8 @@ static struct conf_service *parse_service(xmlNode *node)
                     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)
             {
@@ -143,11 +141,36 @@ static struct conf_service *parse_service(xmlNode *node)
             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
@@ -268,13 +291,16 @@ static struct conf_retrievalprofile *parse_retrievalprofile(xmlNode *node)
                 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"))
@@ -294,8 +320,6 @@ static struct conf_retrievalprofile *parse_retrievalprofile(xmlNode *node)
                     return 0;
                 }
             }
-            if (encoding)
-                r->native_encoding = encoding;
             if (mapto)
             {
                 if (!strcmp(mapto, "marcxml"))
@@ -320,7 +344,7 @@ static struct conf_retrievalprofile *parse_retrievalprofile(xmlNode *node)
             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"))
@@ -399,7 +423,7 @@ static struct conf_config *parse_config(xmlNode *root)
 
 int read_config(const char *fname)
 {
-    xmlDoc *doc = xmlReadFile(fname, NULL, 0);
+    xmlDoc *doc = xmlParseFile(fname);
     const char *p;
 
     if (!nmem)  // Initialize
@@ -413,7 +437,7 @@ int read_config(const char *fname)
         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);