Fix nasty bug of overrides not working

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

diff --git a/src/settings.c b/src/settings.c
index 3b7a923..72a47d0 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -66,6 +66,7 @@ static char *hard_settings[] = {
     "pz:sru_version",
     "pz:pqf_prefix",
     "pz:sort",
+    "pz:recordfilter",
     0
 };
 
@@ -133,10 +134,10 @@ static int isdir(const char *path)
 }
 
 // Read settings from an XML file, calling handler function for each setting
-static void read_settings_node(xmlNode *n,
-                               struct conf_service *service,
-                               void (*fun)(struct conf_service *service,
-                                           struct setting *set))
+void settings_read_node_x(xmlNode *n,
+                          void *client_data,
+                          void (*fun)(void *client_data,
+                                      struct setting *set))
 {
     xmlChar *namea, *targeta, *valuea, *usera, *precedencea;
 
@@ -195,7 +196,7 @@ static void read_settings_node(xmlNode *n,
                     strcpy(valueb, (const char *) valuea);
                 set.value = valueb;
                 set.next = 0;
-                (*fun)(service, &set);
+                (*fun)(client_data, &set);
             }
             xmlFree(name);
             xmlFree(precedence);
@@ -217,8 +218,8 @@ static void read_settings_node(xmlNode *n,
 }
  
 static void read_settings_file(const char *path,
-                               struct conf_service *service,
-                               void (*fun)(struct conf_service *service,
+                               void *client_data,
+                               void (*fun)(void *client_data,
                                            struct setting *set))
 {
     xmlDoc *doc = xmlParseFile(path);
@@ -230,7 +231,7 @@ static void read_settings_file(const char *path,
         exit(1);
     }
     n = xmlDocGetRootElement(doc);
-    read_settings_node(n, service, fun);
+    settings_read_node_x(n, client_data, fun);
 
     xmlFreeDoc(doc);
 }
@@ -239,8 +240,8 @@ static void read_settings_file(const char *path,
 // Recursively read files or directories, invoking a 
 // callback for each one
 static void read_settings(const char *path,
-                          struct conf_service *service,
-                          void (*fun)(struct conf_service *service,
+                          void *client_data,
+                          void (*fun)(void *client_data,
                                       struct setting *set))
 {
     DIR *d;
@@ -260,12 +261,12 @@ static void read_settings(const char *path,
             if (*de->d_name == '.' || !strcmp(de->d_name, "CVS"))
                 continue;
             sprintf(tmp, "%s/%s", path, de->d_name);
-            read_settings(tmp, service, fun);
+            read_settings(tmp, client_data, fun);
         }
         closedir(d);
     }
     else if ((dot = strrchr(path, '.')) && !strcmp(dot + 1, "xml"))
-        read_settings_file(path, service, fun);
+        read_settings_file(path, client_data, fun);
 }
 
 // Determines if a ZURL is a wildcard, and what kind
@@ -335,7 +336,7 @@ static void update_database(void *context, struct database *db)
                            context)->set;
     struct conf_service *service = ((struct update_database_context *) 
                                     context)->service;
-    struct setting *s, **sp;
+    struct setting **sp;
     int offset;
 
     // Is this the right database?
@@ -347,24 +348,34 @@ static void update_database(void *context, struct database *db)
 
     // First we determine if this setting is overriding  any existing settings
     // with the same name.
-    for (s = db->settings[offset], sp = &db->settings[offset]; s;
-            sp = &s->next, s = s->next)
-        if (!strcmp(s->name, set->name))
+    assert(offset < db->num_settings);
+    for (sp = &db->settings[offset]; *sp; )
+        if (!strcmp((*sp)->name, set->name))
         {
-            if (s->precedence < set->precedence)
+            if ((*sp)->precedence < set->precedence)
+            {
                 // We discard the value (nmem keeps track of the space)
                 *sp = (*sp)->next; // unlink value from existing setting
-            else if (s->precedence > set->precedence)
+            }
+            else if ((*sp)->precedence > set->precedence)
+            {
                 // Db contains a higher-priority setting. Abort search
                 break;
-            if (zurl_wildcard(s->target) > zurl_wildcard(set->target))
+            }
+            else if (zurl_wildcard((*sp)->target) > zurl_wildcard(set->target))
+            {
                 // target-specific value trumps wildcard. Delete.
                 *sp = (*sp)->next; // unlink.....
-            else if (!zurl_wildcard(s->target))
+            }
+            else if (!zurl_wildcard((*sp)->target))
                 // Db already contains higher-priority setting. Abort search
                 break;
+            else
+                sp = &(*sp)->next;
         }
-    if (!s) // s will be null when there are no higher-priority settings -- we add one
+        else
+            sp = &(*sp)->next;
+    if (!*sp) // is null when there are no higher-priority settings, so we add one
     {
         struct setting *new = nmem_malloc(service->nmem, sizeof(*new));
 
@@ -380,9 +391,9 @@ static void update_database(void *context, struct database *db)
 
 // Callback -- updates database records with dictionary entries as appropriate
 // This is used in pass 2 to assign name/value pairs to databases
-static void update_databases(struct conf_service *service, 
-                             struct setting *set)
+static void update_databases(void *client_data, struct setting *set)
 {
+    struct conf_service *service = (struct conf_service *) client_data;
     struct update_database_context context;
     context.set = set;
     context.service = service;
@@ -423,9 +434,9 @@ static void initialize_soft_settings(struct conf_service *service)
     }
 }
 
-static void prepare_target_dictionary(struct conf_service *service,
-                                      struct setting *set)
+static void prepare_target_dictionary(void *client_data, struct setting *set)
 {
+    struct conf_service *service = (struct conf_service *) client_data;
     struct setting_dictionary *dictionary = service->dictionary;
 
     int i;
@@ -470,9 +481,9 @@ void settings_read_node(struct conf_service *service, xmlNode *n,
                         int pass)
 {
     if (pass == 1)
-        read_settings_node(n, service, prepare_target_dictionary);
+        settings_read_node_x(n, service, prepare_target_dictionary);
     else
-        read_settings_node(n, service, update_databases);
+        settings_read_node_x(n, service, update_databases);
 }
 
 /*