X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=f616eb8ff807241b58fb7278f6fd1ce97ac5750c;hb=b4e80d145253134b44614896ba7f0b1975d22afa;hp=f602843201eacab241072a560713087d95aa06a5;hpb=541b55d47e25948f632382f7b96f1fffad00ca7f;p=pazpar2-moved-to-github.git

diff --git a/src/settings.c b/src/settings.c
index f602843..f616eb8 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,4 +1,4 @@
-/* $Id: settings.c,v 1.22 2007-05-18 19:52:52 quinn Exp $
+/* $Id: settings.c,v 1.27 2008-02-20 06:22:32 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -59,6 +59,8 @@ static char *hard_settings[] = {
     "pz:name",
     "pz:queryencoding",
     "pz:ip",
+    "pz:zproxy",
+    "pz:apdulog",
     0
 };
 
@@ -71,6 +73,11 @@ struct setting_dictionary
 
 static struct setting_dictionary *dictionary = 0;
 
+// This establishes the precedence of wildcard expressions
+#define SETTING_WILDCARD_NO     0 // No wildcard
+#define SETTING_WILDCARD_DB     1 // Database wildcard 'host:port/*'
+#define SETTING_WILDCARD_YES    2 // Complete wildcard '*'
+
 // Returns size of settings directory
 int settings_num(void)
 {
@@ -244,6 +251,19 @@ static void read_settings(const char *path,
         read_settings_file(path, fun);
 }
 
+// Determines if a ZURL is a wildcard, and what kind
+static int zurl_wildcard(const char *zurl)
+{
+    if (!zurl)
+        return SETTING_WILDCARD_NO;
+    if (*zurl == '*')
+        return SETTING_WILDCARD_YES;
+    else if (*(zurl + strlen(zurl) - 1) == '*')
+        return SETTING_WILDCARD_DB;
+    else
+        return SETTING_WILDCARD_NO;
+}
+
 // Callback. Adds a new entry to the dictionary if necessary
 // This is used in pass 1 to determine layout of dictionary
 // and to load any databases mentioned
@@ -253,7 +273,7 @@ static void prepare_dictionary(struct setting *set)
     char *p;
 
     // If target address is not wildcard, add the database
-    if (*set->target && set->target[strlen(set->target) - 1] != '*')
+    if (*set->target && !zurl_wildcard(set->target))
         find_database(set->target, 0);
 
     // Determine if we already have a dictionary entry
@@ -322,15 +342,15 @@ static void update_database(void *context, struct database *db)
         {
             if (s->precedence < set->precedence)
                 // We discard the value (nmem keeps track of the space)
-                *sp = (*sp)->next;
+                *sp = (*sp)->next; // unlink value from existing setting
             else if (s->precedence > set->precedence)
-                // Db contains a higher-priority setting. Abort 
+                // Db contains a higher-priority setting. Abort search
                 break;
-            if (*s->target == '*' && *set->target != '*')
+            if (zurl_wildcard(s->target) > zurl_wildcard(set->target))
                 // target-specific value trumps wildcard. Delete.
-                *sp = (*sp)->next;
-            else if (*s->target != '*' && *set->target == '*')
-                // Db already contains higher-priority setting. Abort
+                *sp = (*sp)->next; // unlink.....
+            else if (!zurl_wildcard(s->target))
+                // Db already contains higher-priority setting. Abort search
                 break;
         }
     if (!s) // s will be null when there are no higher-priority settings -- we add one
@@ -351,7 +371,7 @@ static void update_database(void *context, struct database *db)
 // This is used in pass 2 to assign name/value pairs to databases
 static void update_databases(struct setting *set)
 {
-    grep_databases(set, 0, update_database);
+    predef_grep_databases(set, 0, update_database);
 }
 
 // This simply copies the 'hard' (application-specific) settings
@@ -364,6 +384,30 @@ static void initialize_hard_settings(struct setting_dictionary *dict)
     dict->num = dict->size;
 }
 
+// Read any settings names introduced in service definition (config) and add to dictionary
+// This is done now to avoid errors if user settings are declared in session overrides
+static void initialize_soft_settings()
+{
+    struct conf_service *service = config->servers->service;
+    int i;
+
+    for (i = 0; i < service->num_metadata; i++)
+    {
+        struct setting set;
+        struct conf_metadata *md = &service->metadata[i];
+
+        if (md->setting == Metadata_setting_no)
+            continue;
+
+        set.precedence = 0;
+        set.target = "";
+        set.name = md->name;
+        set.value = "";
+        set.next = 0;
+        prepare_dictionary(&set);
+    }
+}
+
 // If we ever decide we need to be able to specify multiple settings directories,
 // the two calls to read_settings must be split -- so the dictionary is prepared
 // for the contents of every directory before the databases are updated.
@@ -384,6 +428,7 @@ void init_settings(void)
     memset(new, 0, sizeof(*new));
     initialize_hard_settings(new);
     dictionary = new;
+    initialize_soft_settings();
 }
 
 /*