/* 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
#include <stdio.h>
#include <sys/types.h>
#include <yaz/dirent.h>
+#include <yaz/xml_get.h>
#include <stdlib.h>
#include <sys/stat.h>
"pz:sortmap:",
"pz:present_chunk",
"pz:block_timeout",
+ "pz:extendrecs",
+ "pz:authentication_mode",
+ "pz:native_score",
+ "pz:memcached",
+ "pz:redis",
+ "pz:timeout",
0
};
size_t maxlen;
int i;
const char *p;
-
+
assert(name);
if (!strncmp("pz:", name, 3) && (p = strchr(name + 3, ':')))
return service->dictionary->dict[offset];
}
-
-// Apply a session override to a database
-void service_apply_setting(struct conf_service *service, char *setting, char *value)
-{
- struct setting *new = nmem_malloc(service->nmem, sizeof(*new));
- int offset = settings_create_offset(service, setting);
- 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;
-}
-
-
static int isdir(const char *path)
{
struct stat st;
struct setting *set))
{
int ret_val = 0; /* success */
- char *namea = (char *) xmlGetProp(n, (xmlChar *) "name");
- char *targeta = (char *) xmlGetProp(n, (xmlChar *) "target");
- char *valuea = (char *) xmlGetProp(n, (xmlChar *) "value");
- char *usera = (char *) xmlGetProp(n, (xmlChar *) "user");
- char *precedencea = (char *) xmlGetProp(n, (xmlChar *) "precedence");
+ const char *namea = yaz_xml_get_prop(n, "name");
+ const char *targeta = yaz_xml_get_prop(n, "target");
+ const char *valuea = yaz_xml_get_prop(n, "value");
+ const char *precedencea = yaz_xml_get_prop(n, "precedence");
for (n = n->children; n; n = n->next)
{
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");
+ const char *name = yaz_xml_get_prop(n, "name");
+ const char *target = yaz_xml_get_prop(n, "target");
+ const char *value = yaz_xml_get_prop(n, "value");
+ const char *precedence = yaz_xml_get_prop(n, "precedence");
+ xmlChar *buf_out = 0;
+
+ set.next = 0;
if (precedence)
set.precedence = atoi((char *) precedence);
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 = (const char *) buf_out;
+ xmlFreeDoc(doc);
+ }
+ }
if (set.name && set.value && set.target)
(*fun)(client_data, &set);
yaz_log(YLOG_WARN, "missing name/value/target for setting");
ret_val = -1;
}
- xmlFree(name);
- xmlFree(precedence);
- xmlFree(value);
- xmlFree(user);
- xmlFree(target);
+ xmlFree(buf_out);
}
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;
}
}
- xmlFree(namea);
- xmlFree(precedencea);
- xmlFree(valuea);
- xmlFree(usera);
- xmlFree(targeta);
return ret_val;
}
-
+
static int read_settings_file(const char *path,
void *client_data,
void (*fun)(void *client_data,
}
-// 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,
}
}
-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);
}
}
-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
{
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;
// 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);
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;
projects / pazpar2-moved-to-github.git / blobdiff