X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsettings.c;h=ece8f043bf58b3317345a214d9a9eba704dcee42;hb=11eca12da46bf6031a816aa57ec519349a457030;hp=491ad08f385483f77ea5aad1f6b517e23908998e;hpb=7d103e1dcbb332af2b4dd725cd7689057eed0092;p=pazpar2-moved-to-github.git

diff --git a/src/settings.c b/src/settings.c
index 491ad08..ece8f04 100644
--- a/src/settings.c
+++ b/src/settings.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
@@ -81,6 +81,11 @@ static char *hard_settings[] = {
     "pz:sortmap:",
     "pz:present_chunk",
     "pz:block_timeout",
+    "pz:extendrecs",
+    "pz:authentication_mode",
+    "pz:native_score",
+    "pz:memcached",
+    "pz:redis",
     0
 };
 
@@ -108,7 +113,7 @@ static int settings_index_lookup(struct setting_dictionary *dictionary, const ch
     size_t maxlen;
     int i;
     const char *p;
-    
+
     assert(name);
 
     if (!strncmp("pz:", name, 3) && (p = strchr(name + 3, ':')))
@@ -153,17 +158,24 @@ char *settings_name(struct conf_service *service, int offset)
 
 
 // Apply a session override to a database
-void service_apply_setting(struct conf_service *service, char *setting, char *value)
+void service_apply_setting(struct conf_service *service, char *name, char *value)
 {
-    struct setting *new = nmem_malloc(service->nmem, sizeof(*new));
-    int offset = settings_create_offset(service, setting);
+    struct setting *s;
+    int offset = settings_create_offset(service, name);
     expand_settings_array(&service->settings->settings, &service->settings->num_settings, offset, service->nmem);
-    new->precedence = 0;
-    new->target = NULL;
-    new->name = setting;
-    new->value = value;
-    new->next = service->settings->settings[offset];
-    service->settings->settings[offset] = new;
+    for (s = service->settings->settings[offset]; s; s = s->next)
+        if (!strcmp(s->name, name))
+        {
+            s->value = value;
+            return;
+        }
+    s = nmem_malloc(service->nmem, sizeof(*s));
+    s->precedence = 0;
+    s->target = NULL;
+    s->name = name;
+    s->value = value;
+    s->next = service->settings->settings[offset];
+    service->settings->settings[offset] = s;
 }
 
 
@@ -241,7 +253,7 @@ int settings_read_node_x(xmlNode *n,
                     xmlDocSetRootElement(doc, xmlCopyNode(root, 1));
                     xmlDocDumpMemory(doc, &buf_out, &len_out);
                     /* xmlDocDumpMemory 0-terminates */
-                    set.value = (char *) buf_out; 
+                    set.value = (char *) buf_out;
                     xmlFreeDoc(doc);
                 }
             }
@@ -266,7 +278,7 @@ int settings_read_node_x(xmlNode *n,
         }
         else
         {
-            yaz_log(YLOG_WARN, "Unknown element %s in settings file", 
+            yaz_log(YLOG_WARN, "Unknown element %s in settings file",
                     (char*) n->name);
             ret_val = -1;
         }
@@ -278,7 +290,7 @@ int settings_read_node_x(xmlNode *n,
     xmlFree(targeta);
     return ret_val;
 }
- 
+
 static int read_settings_file(const char *path,
                               void *client_data,
                               void (*fun)(void *client_data,
@@ -301,7 +313,7 @@ static int read_settings_file(const char *path,
 }
 
 
-// Recursively read files or directories, invoking a 
+// Recursively read files or directories, invoking a
 // callback for each one
 static int read_settings(const char *path,
                           void *client_data,
@@ -392,7 +404,7 @@ void expand_settings_array2(struct settings_array *settings, int offset, NMEM nm
 static void update_settings(struct setting *set, struct settings_array *settings, int offset, NMEM nmem)
 {
     struct setting **sp;
-    yaz_log(YLOG_LOG, "update service settings offset %d with %s=%s", offset, set->name, set->value);
+    yaz_log(YLOG_DEBUG, "update service settings offset %d with %s=%s", offset, set->name, set->value);
     expand_settings_array2(settings, offset, nmem);
 
     // First we determine if this setting is overriding any existing settings
@@ -444,7 +456,7 @@ static void update_database_fun(void *context, struct database *db)
 {
     struct setting *set = ((struct update_database_context *)
                            context)->set;
-    struct conf_service *service = ((struct update_database_context *) 
+    struct conf_service *service = ((struct update_database_context *)
                                     context)->service;
     struct setting **sp;
     int offset;
@@ -535,7 +547,7 @@ void initialize_soft_settings(struct conf_service *service)
 
         // Also create setting for some metadata attributes.
         if (md->limitmap) {
-            int index; 
+            int index;
             WRBUF wrbuf = wrbuf_alloc();
             yaz_log(YLOG_DEBUG, "Metadata %s has limitmap: %s ",md->name,  md->limitmap);
             wrbuf_printf(wrbuf, "pz:limitmap:%s", md->name);
@@ -571,9 +583,9 @@ static void prepare_target_dictionary(void *client_data, struct setting *set)
 void init_settings(struct conf_service *service)
 {
     struct setting_dictionary *new;
-    
+
     assert(service->nmem);
-    
+
     new = nmem_malloc(service->nmem, sizeof(*new));
     memset(new, 0, sizeof(*new));
     service->dictionary = new;