Added setting to specify pqf prefix, to support database subset selection, etc.

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

diff --git a/src/settings.c b/src/settings.c
index 5a0dd2a..ef0ea22 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,7 +1,5 @@
-/* $Id: settings.c,v 1.26 2007-07-30 23:16:33 quinn Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 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
@@ -14,21 +12,25 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+*/
 
 // This module implements a generic system of settings
 // (attribute-value) that can be associated with search targets. The
 // system supports both default values, per-target overrides, and
 // per-user settings.
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <dirent.h>
+#include "direntz.h"
 #include <stdlib.h>
 #include <sys/stat.h>
 
@@ -61,6 +63,7 @@ static char *hard_settings[] = {
     "pz:ip",
     "pz:zproxy",
     "pz:apdulog",
+    "pz:pqf_prefix",
     0
 };
 
@@ -73,6 +76,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)
 {
@@ -242,10 +250,23 @@ static void read_settings(const char *path,
         }
         closedir(d);
     }
-    else if ((dot = rindex(path, '.')) && !strcmp(dot + 1, "xml"))
+    else if ((dot = strrchr(path, '.')) && !strcmp(dot + 1, "xml"))
         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
@@ -255,7 +276,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
@@ -297,22 +318,6 @@ static void update_database(void *context, struct database *db)
     if (!match_zurl(db->url, set->target))
         return;
 
-#ifdef GAGA
-    // Initialize settings array if it doesn't exist.
-    // If so, also set the 'id' automatic setting
-    if (!db->settings)
-    {
-        struct setting *id = nmem_malloc(nmem, sizeof(struct setting));
-
-        db->settings = nmem_malloc(nmem, sizeof(struct settings*) * dictionary->num);
-        memset(db->settings, 0, sizeof(struct settings*) * dictionary->num);
-        id->precedence = 0;
-        id->name = "pz:id";
-        id->target = id->value = db->url;
-        id->next = 0;
-        db->settings[PZ_ID] = id;
-    }
-#endif
     if ((offset = settings_offset_cprefix(set->name)) < 0)
         abort(); // Should never get here
 
@@ -324,15 +329,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