X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fsettings.c;h=4e0624f35409b05cf0ebbde9f313d6d9d4a26997;hb=8f0d6c3aed956aa0c9c6af420a9025f1caa6e899;hp=c5f1b2eb8a37d9d16de24284540b2cfa322a6160;hpb=13cadf98675c15f9be29c417dca2f6f63a33e658;p=pazpar2-moved-to-github.git

diff --git a/src/settings.c b/src/settings.c
index c5f1b2e..4e0624f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1,4 +1,25 @@
-// $Id: settings.c,v 1.7 2007-04-08 20:52:09 quinn Exp $
+/* $Id: settings.c,v 1.14 2007-04-11 19:55:57 quinn Exp $
+   Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+ */
+
+
 // 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.
@@ -31,6 +52,11 @@ static char *hard_settings[] = {
     "pz:encoding",
     "pz:xslt",
     "pz:nativesyntax",
+    "pz:authentication",
+    "pz:allow",
+    "pz:maxrecs",
+    "pz:id",
+    "pz:name",
     0
 };
 
@@ -43,6 +69,12 @@ struct setting_dictionary
 
 static struct setting_dictionary *dictionary = 0;
 
+// Returns size of settings directory
+int settings_num(void)
+{
+    return dictionary->num;
+}
+
 int settings_offset(const char *name)
 {
     int i;
@@ -131,7 +163,6 @@ static void read_settings_file(const char *path,
                 struct setting set;
                 char nameb[1024];
                 char targetb[1024];
-                char userb[1024];
                 char valueb[1024];
 
                 // Copy everything into a temporary buffer -- we decide
@@ -142,13 +173,6 @@ static void read_settings_file(const char *path,
                     set.precedence = atoi((char *) precedencea);
                 else
                     set.precedence = 0;
-                set.user = userb;
-                if (user)
-                    strcpy(userb, user);
-                else if (usera)
-                    strcpy(userb, (const char *) usera);
-                else
-                    set.user = "";
                 if (target)
                     strcpy(targetb, target);
                 else
@@ -184,6 +208,8 @@ static void read_settings_file(const char *path,
     xmlFree(valuea);
     xmlFree(usera);
     xmlFree(targeta);
+
+    xmlFreeDoc(doc);
 }
  
 // Recursively read files in a directory structure, calling 
@@ -219,16 +245,23 @@ static void read_settings(const char *path,
 
 // 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
 static void prepare_dictionary(struct setting *set)
 {
     int i;
     char *p;
 
+    // If target address is not wildcard, add the database
+    if (*set->target && set->target[strlen(set->target) - 1] != '*')
+        find_database(set->target, 0);
+
+    // Determine if we already have a dictionary entry
     if (!strncmp(set->name, "pz:", 3) && (p = strchr(set->name + 3, ':')))
         *(p + 1) = '\0';
     for (i = 0; i < dictionary->num; i++)
         if (!strcmp(dictionary->dict[i], set->name))
             return;
+
     if (!strncmp(set->name, "pz:", 3)) // Probably a typo in config fle
     {
         yaz_log(YLOG_FATAL, "Unknown pz: setting '%s'", set->name);
@@ -256,10 +289,23 @@ static void update_database(void *context, struct database *db)
     struct setting *s, **sp;
     int offset;
 
+    // Is this the right database?
+    if (!match_zurl(db->url, set->target))
+        return;
+
+    // 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;
     }
     if ((offset = settings_offset_cprefix(set->name)) < 0)
         abort(); // Should never get here
@@ -268,7 +314,7 @@ static void update_database(void *context, struct database *db)
     // with the same name.
     for (s = db->settings[offset], sp = &db->settings[offset]; s;
             sp = &s->next, s = s->next)
-        if (!strcmp(s->user, set->user) && !strcmp(s->name, set->name))
+        if (!strcmp(s->name, set->name))
         {
             if (s->precedence < set->precedence)
                 // We discard the value (nmem keeps track of the space)
@@ -292,7 +338,6 @@ static void update_database(void *context, struct database *db)
         new->target = nmem_strdup(nmem, set->target);
         new->name = nmem_strdup(nmem, set->name);
         new->value = nmem_strdup(nmem, set->value);
-        new->user = nmem_strdup(nmem, set->user);
         new->next = db->settings[offset];
         db->settings[offset] = new;
     }
@@ -302,16 +347,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)
 {
-    struct database_criterion crit;
-    struct database_criterion_value val;
-
-    // Update all databases which match pattern in set->target
-    crit.name = "id";
-    crit.values = &val;
-    crit.next = 0;
-    val.value = set->target;
-    val.next = 0;
-    grep_databases(set, &crit, update_database);
+    grep_databases(set, 0, update_database);
 }
 
 // This simply copies the 'hard' (application-specific) settings