X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=0688b8e5018f529f4e500237598596d2c27697c4;hb=af706a898e42f48e8b41a4e797df92e7ecaee56f;hp=a4503b72ffb71c8fd54ab09be3db06f09be3150c;hpb=80655e4b90bbe16ee3e3373ef310267cd5a651a3;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index a4503b7..0688b8e 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -512,6 +512,18 @@ static int parse_metadata(struct conf_service *service, xmlNode *n,
     return 0;
 }
 
+
+static void count_metadata(xmlNode *n, int *num_metadata, int *num_sortkeys)
+{
+    xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
+    (*num_metadata)++;
+
+    if (sortkey && strcmp((const char *) sortkey, "no"))
+        (*num_sortkeys)++;
+    xmlFree(sortkey);
+}
+
+
 static struct conf_service *service_create_static(struct conf_server *server,
                                                   xmlNode *node,
                                                   const char *service_id)
@@ -530,11 +542,18 @@ static struct conf_service *service_create_static(struct conf_server *server,
         if (n->type == XML_ELEMENT_NODE && !strcmp((const char *)
                                                    n->name, "metadata"))
         {
-            xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
-            num_metadata++;
-            if (sortkey && strcmp((const char *) sortkey, "no"))
-                num_sortkeys++;
-            xmlFree(sortkey);
+            if (n->children) // This is a <metadata> container, look at its contents.
+            {
+                xmlNode *m;
+                for (m = n->children; m; m = m->next)
+                {
+                    if (m->type == XML_ELEMENT_NODE &&
+                            !strcmp((const char *) m->name, "metadata"))
+                        count_metadata(m, &num_metadata, &num_sortkeys);
+                }
+            }
+            else // This is a metadata-element proper, count it right away.
+                count_metadata(n, &num_metadata, &num_sortkeys);
         }
 
     service = service_init(server, num_metadata, num_sortkeys, service_id);
@@ -622,8 +641,8 @@ static struct conf_service *service_create_static(struct conf_server *server,
         {
             if (!service->charsets)
                 service->charsets = pp2_charset_fact_create();
-            if (pp2_charset_fact_define(service->charsets,
-                                        n->children, (const char *) n->name))
+            if (pp2_charset_fact_define(service->charsets, n,
+                                        (const char *) n->name))
             {
                 yaz_log(YLOG_FATAL, "ICU chain definition error");
                 return 0;
@@ -631,8 +650,17 @@ static struct conf_service *service_create_static(struct conf_server *server,
         }
         else if (!strcmp((const char *) n->name, (const char *) "metadata"))
         {
-            if (parse_metadata(service, n, &md_node, &sk_node))
-                return 0;
+            if (n->children) // This is a <metadata> container, look at its content.
+            {
+                xmlNode *m;
+                for (m = n->children; m; m = m->next)
+                    if ((!strcmp((const char *) m->name, (const char *) "metadata")))
+                        if (parse_metadata(service, m, &md_node, &sk_node))
+                            return 0;
+            }
+            else // This is a metadata-element proper, count it right away.
+                if (parse_metadata(service, n, &md_node, &sk_node))
+                    return 0;
         }
         else if (!strcmp((const char *) n->name, (const char *) "xslt"))
         {
@@ -652,7 +680,7 @@ static struct conf_service *service_create_static(struct conf_server *server,
                     service->rank_cluster = 1;
                 else if (!strcmp(rank_cluster, "no"))
                     service->rank_cluster = 0;
-                else 
+                else
                 {
                     yaz_log(YLOG_FATAL, "service: rank@cluster boolean");
                     return 0;
@@ -683,7 +711,7 @@ static struct conf_service *service_create_static(struct conf_server *server,
                 if (!strcmp(rank_length, "linear"))
                     service->rank_length = 2;
                 else if (!strcmp(rank_length, "log"))
-                    service->rank_length = 1; 
+                    service->rank_length = 1;
                 else if (!strcmp(rank_length, "none"))
                     service->rank_length = 0;
                 else
@@ -916,8 +944,8 @@ static struct conf_server *server_create(struct conf_config *config,
         {
             if (!server->charsets)
                 server->charsets = pp2_charset_fact_create();
-            if (pp2_charset_fact_define(server->charsets,
-                                        n->children, (const char *) n->name))
+            if (pp2_charset_fact_define(server->charsets, n,
+                                        (const char *) n->name))
             {
                 yaz_log(YLOG_FATAL, "ICU chain definition error");
                 return 0;
@@ -1235,8 +1263,8 @@ struct conf_config *config_create(const char *fname, int verbose)
 {
     xmlDoc *doc = xmlReadFile(fname,
                               NULL,
-                              XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
-                              + XML_PARSE_NSCLEAN + XML_PARSE_NONET );
+                              XML_PARSE_XINCLUDE
+                              + XML_PARSE_NSCLEAN + XML_PARSE_NONET);
     xmlNode *n;
     const char *p;
     int r;