X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=eee6288e9a206e541ffc7bc76932b3d7738cf1f7;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=e7d459ba717d9a1e531a4061999e22e6be3443b8;hpb=848a659ecc0b24d1881c3f091393b99259130aa7;p=pazpar2-moved-to-github.git

diff --git a/src/settings.c b/src/settings.c
index e7d459b..eee6288 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,7 +81,9 @@ static char *hard_settings[] = {
     "pz:sortmap:",
     "pz:present_chunk",
     "pz:block_timeout",
-    "pz:embed_xslt",
+    "pz:extendrecs",
+    "pz:authentication_mode",
+    "pz:native_score",
     0
 };
 
@@ -109,7 +111,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, ':')))
@@ -199,12 +201,16 @@ int settings_read_node_x(xmlNode *n,
             continue;
         if (!strcmp((const char *) n->name, "set"))
         {
+            xmlNode *root = n->children;
             struct setting set;
             char *name = (char *) xmlGetProp(n, (xmlChar *) "name");
             char *target = (char *) xmlGetProp(n, (xmlChar *) "target");
             char *value = (char *) xmlGetProp(n, (xmlChar *) "value");
             char *user = (char *) xmlGetProp(n, (xmlChar *) "user");
             char *precedence = (char *) xmlGetProp(n, (xmlChar *) "precedence");
+            xmlChar *buf_out = 0;
+
+            set.next = 0;
 
             if (precedence)
                 set.precedence = atoi((char *) precedence);
@@ -215,8 +221,33 @@ int settings_read_node_x(xmlNode *n,
 
             set.target = target ? target : targeta;
             set.name = name ? name : namea;
-            set.value = value ? value : valuea;
-            set.next = 0;
+
+            while (root && root->type != XML_ELEMENT_NODE)
+                root = root->next;
+            if (!root)
+                set.value = value ? value : valuea;
+            else
+            {   /* xml document content for this setting */
+                xmlDoc *doc = xmlNewDoc(BAD_CAST "1.0");
+                if (!doc)
+                {
+                    if (set.name)
+                        yaz_log(YLOG_WARN, "bad XML content for setting "
+                                "name=%s", set.name);
+                    else
+                        yaz_log(YLOG_WARN, "bad XML content for setting");
+                    ret_val = -1;
+                }
+                else
+                {
+                    int len_out;
+                    xmlDocSetRootElement(doc, xmlCopyNode(root, 1));
+                    xmlDocDumpMemory(doc, &buf_out, &len_out);
+                    /* xmlDocDumpMemory 0-terminates */
+                    set.value = (char *) buf_out;
+                    xmlFreeDoc(doc);
+                }
+            }
 
             if (set.name && set.value && set.target)
                 (*fun)(client_data, &set);
@@ -229,6 +260,7 @@ int settings_read_node_x(xmlNode *n,
                     yaz_log(YLOG_WARN, "missing name/value/target for setting");
                 ret_val = -1;
             }
+            xmlFree(buf_out);
             xmlFree(name);
             xmlFree(precedence);
             xmlFree(value);
@@ -237,7 +269,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;
         }
@@ -249,7 +281,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,
@@ -272,7 +304,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,
@@ -343,7 +375,7 @@ void expand_settings_array(struct setting ***set_ar, int *num, int offset,
     }
 }
 
-void expand_settings_array2(struct settings *settings, int offset, NMEM nmem)
+void expand_settings_array2(struct settings_array *settings, int offset, NMEM nmem)
 {
     assert(offset >= 0);
     assert(settings);
@@ -360,10 +392,10 @@ void expand_settings_array2(struct settings *settings, int offset, NMEM nmem)
     }
 }
 
-static void update_settings(struct setting *set, struct settings *settings, int offset, NMEM nmem)
+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
@@ -415,7 +447,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;
@@ -506,7 +538,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);
@@ -542,9 +574,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;