X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=a23c6fdb71728c9336a7741c2bf7d1e59ec43eb0;hb=6fd6f4efaaf663d850ef6ad93673fb8cd63f6170;hp=d6fb7578fd13e5f6d361f6cf3ae30ae2e9a46a6f;hpb=6f9e90cf2c4bca753cf64448eb6893a7c3cd5fe8;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index d6fb757..a23c6fd 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 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
@@ -58,7 +58,7 @@ struct database *new_database(const char *id, NMEM nmem)
 {
     return new_database_inherit_settings(id, nmem, 0);
 }
-struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings *service_settings)
+struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings)
 {
     struct database *db;
     struct setting *idset;
@@ -68,18 +68,17 @@ struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct
     db->next = 0;
 
     if (service_settings && service_settings->num_settings > 0) {
-        yaz_log(YLOG_LOG, "copying values from service settings");
+        yaz_log(YLOG_DEBUG, "copying settings from service to database %s settings", db->id);
         db->num_settings = service_settings->num_settings;
-        db->settings = nmem_malloc(nmem, sizeof(struct settings*) * db->num_settings);
+        db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
         // Initialize database settings with service settings
-        memcpy(db->settings, service_settings->settings,  sizeof(struct settings*) * db->num_settings);
-
+        memcpy(db->settings, service_settings->settings,  sizeof(*db->settings) * db->num_settings);
     }
     else {
-        yaz_log(YLOG_LOG, "No service settings delivered");
+        yaz_log(YLOG_DEBUG, "No service settings to database %s ", db->id);
         db->num_settings = PZ_MAX_EOF;
-        db->settings = nmem_malloc(nmem, sizeof(struct settings*) * db->num_settings);
-        memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
+        db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
+        memset(db->settings, 0, sizeof(*db->settings) * db->num_settings);
     }
     idset = nmem_malloc(nmem, sizeof(*idset));
     idset->precedence = 0;
@@ -100,10 +99,10 @@ struct database *create_database_for_service(const char *id,
     for (p = service->databases; p; p = p->next)
         if (!strcmp(p->id, id))
             return p;
-    
-    yaz_log(YLOG_LOG, "new database from service %s values %p", service->id, service->settings);
-    p = new_database_inherit_settings(id, service->nmem, service->settings);
 
+    yaz_log(YLOG_DEBUG, "new database %s under service %s", id,
+       service->id ? service->id : "null");
+    p = new_database_inherit_settings(id, service->nmem, service->settings);
     p->next = service->databases;
     service->databases = p;
 
@@ -143,7 +142,7 @@ int match_zurl(const char *zurl, const char *pattern)
 
 // This will be generalized at some point
 static int match_criterion(struct setting **settings,
-                           struct conf_service *service, 
+                           struct conf_service *service,
                            struct database_criterion *c)
 {
     int offset = settings_lookup_offset(service, c->name);
@@ -165,12 +164,12 @@ static int match_criterion(struct setting **settings,
                 if (match_zurl(settings[offset]->value, v->value))
                     break;
             }
-            else 
+            else
             {
                 if (!strcmp(settings[offset]->value, v->value))
                     break;
             }
-        }            
+        }
         else if (c->type == PAZPAR2_SUBSTRING_MATCH)
         {
             if (strstr(settings[offset]->value, v->value))
@@ -202,11 +201,18 @@ static struct database_criterion *create_database_criterion(NMEM m,
         int subi;
         struct database_criterion *new = nmem_malloc(m, sizeof(*new));
         char *eq;
-        if ((eq = strchr(values[i], '=')))
-            new->type = PAZPAR2_STRING_MATCH;
-        else if ((eq = strchr(values[i], '~')))
-            new->type = PAZPAR2_SUBSTRING_MATCH;
-        else
+        for (eq = values[i]; *eq; eq++)
+            if (*eq == '=')
+            {
+                new->type = PAZPAR2_STRING_MATCH;
+                break;
+            }
+            else if (*eq == '~')
+            {
+                new->type = PAZPAR2_SUBSTRING_MATCH;
+                break;
+            }
+        if (!*eq)
         {
             yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter");
             return 0;