/* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) 2006-2013 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
"pz:sortmap:",
"pz:present_chunk",
"pz:block_timeout",
+ "pz:extendrecs",
+ "pz:authentication_mode",
+ "pz:native_score",
0
};
size_t maxlen;
int i;
const char *p;
-
+
assert(name);
if (!strncmp("pz:", name, 3) && (p = strchr(name + 3, ':')))
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);
}
}
}
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(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;