/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 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:max_connections",
"pz:reuse_connections",
"pz:termlist_term_factor",
+ "pz:termlist_term_count",
"pz:preferred",
"pz:extra_args",
"pz:query_syntax",
"pz:facetmap:",
"pz:limitmap:",
"pz:url",
+ "pz:sortmap:",
+ "pz:present_chunk",
+ "pz:block_timeout",
+ "pz:extendrecs",
+ "pz:authentication_mode",
+ "pz:native_score",
+ "pz:memcached",
+ "pz:redis",
+ "pz:timeout",
0
};
return service->dictionary->num;
}
-static int settings_lookup(struct conf_service *service, const char *name,
- int allow_create)
+/* Find and possible create a new dictionary entry. Pass valid NMEM pointer if creation is allowed, otherwise null */
+static int settings_index_lookup(struct setting_dictionary *dictionary, const char *name, NMEM nmem)
{
size_t maxlen;
int i;
const char *p;
- struct setting_dictionary *dictionary = service->dictionary;
-
+
assert(name);
if (!strncmp("pz:", name, 3) && (p = strchr(name + 3, ':')))
for (i = 0; i < dictionary->num; i++)
if (!strncmp(name, dictionary->dict[i], maxlen))
return i;
- if (!allow_create)
+ if (!nmem)
return -1;
if (!strncmp("pz:", name, 3))
yaz_log(YLOG_WARN, "Adding pz-type setting name %s", name);
if (dictionary->num + 1 > dictionary->size)
{
char **tmp =
- nmem_malloc(service->nmem, dictionary->size * 2 * sizeof(char*));
+ nmem_malloc(nmem, dictionary->size * 2 * sizeof(char*));
memcpy(tmp, dictionary->dict, dictionary->size * sizeof(char*));
dictionary->dict = tmp;
dictionary->size *= 2;
}
- dictionary->dict[dictionary->num] = nmem_strdup(service->nmem, name);
+ dictionary->dict[dictionary->num] = nmem_strdup(nmem, name);
dictionary->dict[dictionary->num][maxlen-1] = '\0';
return dictionary->num++;
}
int settings_create_offset(struct conf_service *service, const char *name)
{
- return settings_lookup(service, name, 1);
+ return settings_index_lookup(service->dictionary, name, service->nmem);
}
int settings_lookup_offset(struct conf_service *service, const char *name)
{
- return settings_lookup(service, name, 0);
+ return settings_index_lookup(service->dictionary, name, 0);
}
char *settings_name(struct conf_service *service, int offset)
}
// Read settings from an XML file, calling handler function for each setting
-void settings_read_node_x(xmlNode *n,
- void *client_data,
- void (*fun)(void *client_data,
- struct setting *set))
+int settings_read_node_x(xmlNode *n,
+ void *client_data,
+ void (*fun)(void *client_data,
+ struct setting *set))
{
- xmlChar *namea, *targeta, *valuea, *usera, *precedencea;
+ int ret_val = 0; /* success */
+ 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");
- namea = xmlGetProp(n, (xmlChar *) "name");
- targeta = xmlGetProp(n, (xmlChar *) "target");
- valuea = xmlGetProp(n, (xmlChar *) "value");
- usera = xmlGetProp(n, (xmlChar *) "user");
- precedencea = xmlGetProp(n, (xmlChar *) "precedence");
for (n = n->children; n; n = n->next)
{
if (n->type != XML_ELEMENT_NODE)
continue;
if (!strcmp((const char *) n->name, "set"))
{
- char *name, *target, *value, *user, *precedence;
+ xmlNode *root = n->children;
+ struct setting set;
+ 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);
+ else if (precedencea)
+ set.precedence = atoi((char *) precedencea);
+ else
+ set.precedence = 0;
- name = (char *) xmlGetProp(n, (xmlChar *) "name");
- target = (char *) xmlGetProp(n, (xmlChar *) "target");
- value = (char *) xmlGetProp(n, (xmlChar *) "value");
- user = (char *) xmlGetProp(n, (xmlChar *) "user");
- precedence = (char *) xmlGetProp(n, (xmlChar *) "precedence");
+ set.target = target ? target : targeta;
+ set.name = name ? name : namea;
- if ((!name && !namea) || (!value && !valuea) || (!target && !targeta))
- {
- yaz_log(YLOG_FATAL, "set must specify name, value, and target");
- exit(1);
+ 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);
else
{
- struct setting set;
- char nameb[1024];
- char targetb[1024];
- char valueb[1024];
-
- // Copy everything into a temporary buffer -- we decide
- // later if we are keeping it.
- if (precedence)
- set.precedence = atoi((char *) precedence);
- else if (precedencea)
- set.precedence = atoi((char *) precedencea);
+ if (set.name)
+ yaz_log(YLOG_WARN, "missing value and/or target for "
+ "setting name=%s", set.name);
else
- set.precedence = 0;
- if (target)
- strcpy(targetb, target);
- else
- strcpy(targetb, (const char *) targeta);
- set.target = targetb;
- if (name)
- strcpy(nameb, name);
- else
- strcpy(nameb, (const char *) namea);
- set.name = nameb;
- if (value)
- strcpy(valueb, value);
- else
- strcpy(valueb, (const char *) valuea);
- set.value = valueb;
- set.next = 0;
- (*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_FATAL, "Unknown element %s in settings file", (char*) n->name);
- exit(1);
+ 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 void read_settings_file(const char *path,
- void *client_data,
- void (*fun)(void *client_data,
- struct setting *set))
+
+static int read_settings_file(const char *path,
+ void *client_data,
+ void (*fun)(void *client_data,
+ struct setting *set))
{
xmlDoc *doc = xmlParseFile(path);
xmlNode *n;
+ int ret;
if (!doc)
{
yaz_log(YLOG_FATAL, "Failed to parse %s", path);
- exit(1);
+ return -1;
}
n = xmlDocGetRootElement(doc);
- settings_read_node_x(n, client_data, fun);
+ ret = settings_read_node_x(n, client_data, fun);
xmlFreeDoc(doc);
+ return ret;
}
-// Recursively read files or directories, invoking a
+// Recursively read files or directories, invoking a
// callback for each one
-static void read_settings(const char *path,
+static int read_settings(const char *path,
void *client_data,
void (*fun)(void *client_data,
struct setting *set))
{
+ int ret = 0;
DIR *d;
struct dirent *de;
char *dot;
if (!(d = opendir(path)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", path);
- exit(1);
+ return -1;
}
while ((de = readdir(d)))
{
if (*de->d_name == '.' || !strcmp(de->d_name, "CVS"))
continue;
sprintf(tmp, "%s/%s", path, de->d_name);
- read_settings(tmp, client_data, fun);
+ if (read_settings(tmp, client_data, fun))
+ ret = -1;
}
closedir(d);
}
else if ((dot = strrchr(path, '.')) && !strcmp(dot + 1, "xml"))
- read_settings_file(path, client_data, fun);
+ ret = read_settings_file(path, client_data, fun);
+ return ret;
}
// Determines if a ZURL is a wildcard, and what kind
}
}
+void expand_settings_array2(struct settings_array *settings, int offset, NMEM nmem)
+{
+ assert(offset >= 0);
+ assert(settings);
+ if (offset >= settings->num_settings)
+ {
+ int i, n_num = offset + 10;
+ struct setting **n_ar = nmem_malloc(nmem, n_num * sizeof(*n_ar));
+ for (i = 0; i < settings->num_settings; i++)
+ n_ar[i] = settings->settings[i];
+ for (; i < n_num; i++)
+ n_ar[i] = 0;
+ settings->num_settings = n_num;
+ settings->settings = n_ar;
+ }
+}
+
+static void update_settings(struct setting *set, struct settings_array *settings, int offset, NMEM nmem)
+{
+ struct setting **sp;
+ 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
+ // with the same name.
+ assert(offset < settings->num_settings);
+ for (sp = &settings->settings[offset]; *sp; )
+ if (!strcmp((*sp)->name, set->name))
+ {
+ if ((*sp)->precedence < set->precedence)
+ {
+ // We discard the value (nmem keeps track of the space)
+ *sp = (*sp)->next; // unlink value from existing setting
+ }
+ else if ((*sp)->precedence > set->precedence)
+ {
+ // Db contains a higher-priority setting. Abort search
+ break;
+ }
+ else if (zurl_wildcard((*sp)->target) > zurl_wildcard(set->target))
+ {
+ // target-specific value trumps wildcard. Delete.
+ *sp = (*sp)->next; // unlink.....
+ }
+ else if (zurl_wildcard((*sp)->target) < zurl_wildcard(set->target))
+ // Db already contains higher-priority setting. Abort search
+ break;
+ else
+ sp = &(*sp)->next;
+ }
+ else
+ sp = &(*sp)->next;
+ if (!*sp) // is null when there are no higher-priority settings, so we add one
+ {
+ struct setting *new = nmem_malloc(nmem, sizeof(*new));
+ memset(new, 0, sizeof(*new));
+ new->precedence = set->precedence;
+ new->target = nmem_strdup_null(nmem, set->target);
+ new->name = nmem_strdup_null(nmem, set->name);
+ new->value = nmem_strdup_null(nmem, set->value);
+ new->next = settings->settings[offset];
+ settings->settings[offset] = new;
+ }
+}
+
+
// This is called from grep_databases -- adds/overrides setting for a target
// This is also where the rules for precedence of settings are implemented
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;
// Is this the right database?
- if (!match_zurl(db->url, set->target))
+ if (!match_zurl(db->id, set->target))
return;
offset = settings_create_offset(service, set->name);
- expand_settings_array(&db->settings, &db->num_settings, offset,
- service->nmem);
+ expand_settings_array(&db->settings, &db->num_settings, offset, service->nmem);
// First we determine if this setting is overriding any existing settings
// with the same name.
// Read any settings names introduced in service definition (config) and add to dictionary
// This is done now to avoid errors if user settings are declared in session overrides
-static void initialize_soft_settings(struct conf_service *service)
+void initialize_soft_settings(struct conf_service *service)
{
int i;
-
for (i = 0; i < service->num_metadata; i++)
{
struct conf_metadata *md = &service->metadata[i];
- if (md->setting == Metadata_setting_no)
- continue;
-
- settings_create_offset(service, md->name);
+ if (md->setting != Metadata_setting_no)
+ settings_create_offset(service, md->name);
+
+ // Also create setting for some metadata attributes.
+ if (md->limitmap) {
+ 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);
+ index = settings_create_offset(service, wrbuf_cstr(wrbuf));
+ if (index >= 0) {
+ struct setting new;
+ int offset;
+ yaz_log(YLOG_DEBUG, "Service %s default %s=%s",
+ (service->id ? service->id: "unknown"), wrbuf_cstr(wrbuf), md->limitmap);
+ new.name = (char *) wrbuf_cstr(wrbuf);
+ new.value = md->limitmap;
+ new.next = 0;
+ new.target = 0;
+ new.precedence = 0;
+ offset = settings_create_offset(service, new.name);
+ update_settings(&new, service->settings, offset, service->nmem);
+ }
+ wrbuf_destroy(wrbuf);
+ // TODO same for facetmap
+ }
}
}
static void prepare_target_dictionary(void *client_data, struct setting *set)
{
struct conf_service *service = (struct conf_service *) client_data;
- struct setting_dictionary *dictionary = service->dictionary;
-
- int i;
- char *p;
// If target address is not wildcard, add the database
if (*set->target && !zurl_wildcard(set->target))
create_database_for_service(set->target, service);
-
- // 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;
- yaz_log(YLOG_WARN, "Setting '%s' not configured as metadata", set->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;
initialize_soft_settings(service);
}
-void settings_read_file(struct conf_service *service, const char *path,
- int pass)
+int settings_read_file(struct conf_service *service, const char *path,
+ int pass)
{
if (pass == 1)
- read_settings(path, service, prepare_target_dictionary);
+ return read_settings(path, service, prepare_target_dictionary);
else
- read_settings(path, service, update_databases);
+ return read_settings(path, service, update_databases);
}
-void settings_read_node(struct conf_service *service, xmlNode *n,
+int settings_read_node(struct conf_service *service, xmlNode *n,
int pass)
{
if (pass == 1)
- settings_read_node_x(n, service, prepare_target_dictionary);
+ return settings_read_node_x(n, service, prepare_target_dictionary);
else
- settings_read_node_x(n, service, update_databases);
+ return settings_read_node_x(n, service, update_databases);
}
/*
projects / pazpar2-moved-to-github.git / blobdiff