Refactor / reduce globals.

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

diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 6f14cff..f58820c 100644 (file)
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -34,14 +34,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/snprintf.h>
 #include <yaz/tpath.h>
 
-#define CONFIG_NOEXTERNS
 #include "pazpar2_config.h"
-
+#include "settings.h"
 
 static char confdir[256] = ".";
 
-struct conf_config *config = 0;
+struct conf_config *config1 = 0;
+
 
+static char *parse_settings(NMEM nmem, xmlNode *node);
 
 static 
 struct conf_metadata * conf_metadata_assign(NMEM nmem, 
@@ -95,7 +96,8 @@ struct conf_sortkey * conf_sortkey_assign(NMEM nmem,
 }
 
 
-struct conf_service * conf_service_create(int num_metadata, int num_sortkeys)
+struct conf_service * conf_service_create(int num_metadata, int num_sortkeys,
+    const char *service_id)
 {
     struct conf_service * service = 0;
     NMEM nmem = nmem_create();
@@ -103,7 +105,12 @@ struct conf_service * conf_service_create(int num_metadata, int num_sortkeys)
     //assert(nmem);
     
     service = nmem_malloc(nmem, sizeof(struct conf_service));
+    service->nmem = nmem;
+    service->next = 0;
+    service->settings = 0;
+    service->databases = 0;
 
+    service->id = service_id ? nmem_strdup(nmem, service_id) : 0;
     service->num_metadata = num_metadata;
     service->metadata = 0;
     if (service->num_metadata)
@@ -116,8 +123,6 @@ struct conf_service * conf_service_create(int num_metadata, int num_sortkeys)
         service->sortkeys 
             = nmem_malloc(nmem, 
                           sizeof(struct conf_sortkey) * service->num_sortkeys);
-
-    service->nmem = nmem;
     service->dictionary = 0;
     return service; 
 }
@@ -206,7 +211,7 @@ int conf_service_sortkey_field_id(struct conf_service *service,
 /* Code to parse configuration file */
 /* ==================================================== */
 
-static struct conf_service *parse_service(xmlNode *node)
+static struct conf_service *parse_service(xmlNode *node, const char *service_id)
 {
     xmlNode *n;
     int md_node = 0;
@@ -228,13 +233,24 @@ static struct conf_service *parse_service(xmlNode *node)
             xmlFree(sortkey);
         }
 
-    service = conf_service_create(num_metadata, num_sortkeys);    
+    service = conf_service_create(num_metadata, num_sortkeys, service_id);
 
     for (n = node->children; n; n = n->next)
     {
         if (n->type != XML_ELEMENT_NODE)
             continue;
-        if (!strcmp((const char *) n->name, (const char *) "metadata"))
+        if (!strcmp((const char *) n->name, "settings"))
+        {
+            if (service->settings)
+            {
+                yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
+                return 0;
+            }
+            service->settings = parse_settings(service->nmem, n);
+            if (!service->settings)
+                return 0;
+        }
+        else if (!strcmp((const char *) n->name, (const char *) "metadata"))
         {
             xmlChar *xml_name = xmlGetProp(n, (xmlChar *) "name");
             xmlChar *xml_brief = xmlGetProp(n, (xmlChar *) "brief");
@@ -449,7 +465,7 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node)
     server->myurl = 0;
     server->service = 0;
     server->next = 0;
-    server->settings = 0;
+    server->server_settings = 0;
     server->relevance_pct = 0;
     server->sort_pct = 0;
     server->mergekey_pct = 0;
@@ -486,12 +502,12 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node)
         }
         else if (!strcmp((const char *) n->name, "settings"))
         {
-            if (server->settings)
+            if (server->server_settings)
             {
                 yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
                 return 0;
             }
-            if (!(server->settings = parse_settings(nmem, n)))
+            if (!(server->server_settings = parse_settings(nmem, n)))
                 return 0;
         }
         else if (!strcmp((const char *) n->name, "relevance"))
@@ -514,10 +530,39 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node)
         }
         else if (!strcmp((const char *) n->name, "service"))
         {
-            struct conf_service *s = parse_service(n);
-            if (!s)
+            const char *service_id = (const char *)
+                xmlGetProp(n, (xmlChar *) "id");
+
+            struct conf_service **sp = &server->service;
+            for (; *sp; sp = &(*sp)->next)
+                if ((*sp)->id && service_id &&
+                    0 == strcmp((*sp)->id, service_id))
+                {
+                    yaz_log(YLOG_FATAL, "Duplicate service: %s", service_id);
+                    break;
+                }
+                else if (!(*sp)->id && !service_id)
+                {
+                    yaz_log(YLOG_FATAL, "Duplicate unnamed service");
+                    break;
+                }
+
+            if (*sp)  /* service already exist */
                 return 0;
-            server->service = s;
+            else
+            {
+                struct conf_service *s = parse_service(n, service_id);
+                if (s)
+                {
+                    s->relevance_pct = server->relevance_pct ?
+                        server->relevance_pct : pp2_charset_create(0);
+                    s->sort_pct = server->sort_pct ?
+                        server->sort_pct : pp2_charset_create(0);
+                    s->mergekey_pct = server->mergekey_pct ?
+                        server->mergekey_pct : pp2_charset_create(0);
+                    *sp = s;
+                }
+            }
         }
         else
         {
@@ -525,12 +570,6 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node)
             return 0;
         }
     }
-    if (!server->relevance_pct)
-        server->relevance_pct = pp2_charset_create(0);
-    if (!server->sort_pct)
-        server->sort_pct = pp2_charset_create(0);
-    if (!server->mergekey_pct)
-        server->mergekey_pct = pp2_charset_create(0);
     return server;
 }
 
@@ -581,6 +620,19 @@ static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem,
     return r;
 }
 
+struct conf_service *locate_service(struct conf_server *server,
+                                    const char *service_id)
+{
+    struct conf_service *s = server->service;
+    for (; s; s = s->next)
+        if (s->id && service_id && 0 == strcmp(s->id, service_id))
+            return s;
+        else if (!s->id && !service_id)
+            return s;
+    return 0;
+}
+
+
 static struct conf_config *parse_config(xmlNode *root)
 {
     NMEM nmem = nmem_create();
@@ -623,10 +675,11 @@ static struct conf_config *parse_config(xmlNode *root)
     return r;
 }
 
-int read_config(const char *fname)
+struct conf_config *read_config(const char *fname)
 {
     xmlDoc *doc = xmlParseFile(fname);
     const char *p;
+    struct conf_config *config;
 
     xmlSubstituteEntitiesDefault(1);
     xmlLoadExtDtdDefaultValue = 1;
@@ -652,12 +705,26 @@ int read_config(const char *fname)
     config = parse_config(xmlDocGetRootElement(doc));
     xmlFreeDoc(doc);
 
-    if (config)
-        return 1;
-    else
-        return 0;
+    return config;
 }
 
+void config_read_settings(struct conf_config *config,
+                          const char *path_override)
+{
+    struct conf_service *s = config->servers->service;
+    for (;s ; s = s->next)
+    {
+        init_settings(s);
+        if (path_override)
+            settings_read(s, path_override);
+        else if (s->settings)
+            settings_read(s, s->settings);
+        else if (config->servers->server_settings)
+            settings_read(s, config->servers->server_settings);
+        else
+            yaz_log(YLOG_WARN, "No settings for service");
+    }
+}
 
 /*
  * Local variables: