X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=0688b8e5018f529f4e500237598596d2c27697c4;hb=38a9628c8dbe2477c3449e394055b3ff2dc792e0;hp=da3d469dfc3923a45f57070f4a50636aedd893c7;hpb=25df6e6ed7e192fe85435f6127e357f481a385ca;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index da3d469..0688b8e 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -513,11 +513,11 @@ static int parse_metadata(struct conf_service *service, xmlNode *n,
 }
 
 
-static void service_add_metadata(xmlNode *n, int *num_metadata, int *num_sortkeys)
+static void count_metadata(xmlNode *n, int *num_metadata, int *num_sortkeys)
 {
+    xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
     (*num_metadata)++;
 
-    xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
     if (sortkey && strcmp((const char *) sortkey, "no"))
         (*num_sortkeys)++;
     xmlFree(sortkey);
@@ -549,11 +549,11 @@ static struct conf_service *service_create_static(struct conf_server *server,
                 {
                     if (m->type == XML_ELEMENT_NODE &&
                             !strcmp((const char *) m->name, "metadata"))
-                        service_add_metadata(m, &num_metadata, &num_sortkeys);
+                        count_metadata(m, &num_metadata, &num_sortkeys);
                 }
             }
             else // This is a metadata-element proper, count it right away.
-                service_add_metadata(n, &num_metadata, &num_sortkeys);
+                count_metadata(n, &num_metadata, &num_sortkeys);
         }
 
     service = service_init(server, num_metadata, num_sortkeys, service_id);
@@ -641,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;
@@ -680,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;
@@ -944,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;
@@ -1263,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;