Added native dc normaliztion stylesheet.

[pazpar2-moved-to-github.git] / src / pazpar2_config.c

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 11cc316..b209f78 100644 (file)
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -176,7 +176,7 @@ int conf_service_metadata_field_id(struct conf_service *service,
     }
    
     return -1;
-};
+}
 
 
 int conf_service_sortkey_field_id(struct conf_service *service,
@@ -193,7 +193,7 @@ int conf_service_sortkey_field_id(struct conf_service *service,
     }
    
     return -1;
-};
+}
 
 
 
@@ -384,6 +384,7 @@ static struct conf_service *parse_service(xmlNode *node)
             xmlFree(xml_type);
             xmlFree(xml_termlist);
             xmlFree(xml_rank);
+            xmlFree(xml_setting);
             md_node++;
         }
         else
@@ -470,15 +471,21 @@ static struct conf_server *parse_server(xmlNode *node)
         }
         else if (!strcmp((const char *) n->name, "relevance"))
         {
-            server->relevance_pct = pp2_charset_create_xml(n->children);
+            server->relevance_pct = pp2_charset_create_xml(n);
+            if (!server->relevance_pct)
+                return 0;
         }
         else if (!strcmp((const char *) n->name, "sort"))
         {
-            server->sort_pct = pp2_charset_create_xml(n->children);
+            server->sort_pct = pp2_charset_create_xml(n);
+            if (!server->sort_pct)
+                return 0;
         }
         else if (!strcmp((const char *) n->name, "mergekey"))
         {
-            server->mergekey_pct = pp2_charset_create_xml(n->children);
+            server->mergekey_pct = pp2_charset_create_xml(n);
+            if (!server->mergekey_pct)
+                return 0;
         }
         else if (!strcmp((const char *) n->name, "service"))
         {
@@ -625,7 +632,9 @@ int read_config(const char *fname)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+