/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 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:extendrecs",
"pz:authentication_mode",
"pz:native_score",
+ "pz:memcached",
+ "pz:redis",
+ "pz:timeout",
0
};
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)
{
{
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;
xmlDocSetRootElement(doc, xmlCopyNode(root, 1));
xmlDocDumpMemory(doc, &buf_out, &len_out);
/* xmlDocDumpMemory 0-terminates */
- set.value = (char *) buf_out;
+ set.value = (const char *) buf_out;
xmlFreeDoc(doc);
}
}
ret_val = -1;
}
xmlFree(buf_out);
- xmlFree(name);
- xmlFree(precedence);
- xmlFree(value);
- xmlFree(user);
- xmlFree(target);
}
else
{
ret_val = -1;
}
}
- xmlFree(namea);
- xmlFree(precedencea);
- xmlFree(valuea);
- xmlFree(usera);
- xmlFree(targeta);
return ret_val;
}