#include <yaz/snprintf.h>
#include <yaz/tpath.h>
-#define CONFIG_NOEXTERNS
#include "pazpar2_config.h"
+#include "settings.h"
+static WRBUF confdir = 0;
-static char confdir[256] = ".";
-
-struct conf_config *config = 0;
+static char *parse_settings(NMEM nmem, xmlNode *node);
+static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem,
+ xmlNode *node);
static
struct conf_metadata * conf_metadata_assign(NMEM nmem,
service = nmem_malloc(nmem, sizeof(struct conf_service));
service->nmem = nmem;
service->next = 0;
+ service->settings = 0;
+ service->databases = 0;
+ service->targetprofiles = 0;
+
service->id = service_id ? nmem_strdup(nmem, service_id) : 0;
service->num_metadata = num_metadata;
{
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp((const char *) n->name, (const char *) "metadata"))
+ if (!strcmp((const char *) n->name, "settings"))
+ {
+ if (service->settings)
+ {
+ yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
+ return 0;
+ }
+ service->settings = parse_settings(service->nmem, n);
+ if (!service->settings)
+ return 0;
+ }
+ else if (!strcmp((const char *) n->name, (const char *) "targetprofiles"))
+ {
+ if (service->targetprofiles)
+ {
+ yaz_log(YLOG_FATAL, "Can't repeat targetprofiles");
+ return 0;
+ }
+ if (!(service->targetprofiles =
+ parse_targetprofiles(service->nmem, n)))
+ return 0;
+ }
+ else if (!strcmp((const char *) n->name, (const char *) "metadata"))
{
xmlChar *xml_name = xmlGetProp(n, (xmlChar *) "name");
xmlChar *xml_brief = xmlGetProp(n, (xmlChar *) "brief");
else
{
r = nmem_malloc(nmem,
- strlen(confdir) + strlen((const char *) src) + 2);
- sprintf(r, "%s/%s", confdir, src);
+ wrbuf_len(confdir) + strlen((const char *) src) + 2);
+ sprintf(r, "%s/%s", wrbuf_cstr(confdir), src);
}
}
else
server->proxy_host = 0;
server->proxy_port = 0;
server->myurl = 0;
+ server->proxy_addr = 0;
server->service = 0;
server->next = 0;
- server->settings = 0;
+ server->server_settings = 0;
server->relevance_pct = 0;
server->sort_pct = 0;
server->mergekey_pct = 0;
}
else if (!strcmp((const char *) n->name, "settings"))
{
- if (server->settings)
+ if (server->server_settings)
{
yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
return 0;
}
- if (!(server->settings = parse_settings(nmem, n)))
+ if (!(server->server_settings = parse_settings(nmem, n)))
return 0;
}
else if (!strcmp((const char *) n->name, "relevance"))
}
else if (!strcmp((const char *) n->name, "service"))
{
- const char *service_id = (const char *)
+ char *service_id = (char *)
xmlGetProp(n, (xmlChar *) "id");
struct conf_service **sp = &server->service;
{
struct conf_service *s = parse_service(n, service_id);
if (s)
+ {
+ s->relevance_pct = server->relevance_pct ?
+ server->relevance_pct : pp2_charset_create(0);
+ s->sort_pct = server->sort_pct ?
+ server->sort_pct : pp2_charset_create(0);
+ s->mergekey_pct = server->mergekey_pct ?
+ server->mergekey_pct : pp2_charset_create(0);
*sp = s;
+ }
}
+ xmlFree(service_id);
}
else
{
return 0;
}
}
- if (!server->relevance_pct)
- server->relevance_pct = pp2_charset_create(0);
- if (!server->sort_pct)
- server->sort_pct = pp2_charset_create(0);
- if (!server->mergekey_pct)
- server->mergekey_pct = pp2_charset_create(0);
return server;
}
if (yaz_is_abspath(fname))
yaz_snprintf(path, sizeof(path), fname);
else
- yaz_snprintf(path, sizeof(path), "%s/%s", confdir, fname);
+ yaz_snprintf(path, sizeof(path), "%s/%s", wrbuf_cstr(confdir), fname);
return xsltParseStylesheetFile((xmlChar *) path);
}
return r;
}
-struct conf_service *locate_service(const char *service_id)
+struct conf_service *locate_service(struct conf_server *server,
+ const char *service_id)
{
- struct conf_service *s = config->servers->service;
+ struct conf_service *s = server->service;
for (; s; s = s->next)
if (s->id && service_id && 0 == strcmp(s->id, service_id))
return s;
r->nmem = nmem;
r->servers = 0;
- r->targetprofiles = 0;
for (n = root->children; n; n = n->next)
{
}
else if (!strcmp((const char *) n->name, "targetprofiles"))
{
- // It would be fun to be able to fix this sometime
- if (r->targetprofiles)
- {
- yaz_log(YLOG_FATAL, "Can't repeat targetprofiles");
- return 0;
- }
- if (!(r->targetprofiles = parse_targetprofiles(nmem, n)))
- return 0;
+ yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service");
+ return 0;
+
}
else
{
return r;
}
-int read_config(const char *fname)
+struct conf_config *read_config(const char *fname)
{
xmlDoc *doc = xmlParseFile(fname);
const char *p;
+ struct conf_config *config;
xmlSubstituteEntitiesDefault(1);
xmlLoadExtDtdDefaultValue = 1;
yaz_log(YLOG_FATAL, "Failed to read %s", fname);
exit(1);
}
+ confdir = wrbuf_alloc();
if ((p = strrchr(fname,
#ifdef WIN32
'\\'
)))
{
int len = p - fname;
- if (len >= sizeof(confdir))
- len = sizeof(confdir)-1;
- strncpy(confdir, fname, len);
- confdir[len] = '\0';
+ wrbuf_write(confdir, fname, len);
}
+ wrbuf_puts(confdir, "");
config = parse_config(xmlDocGetRootElement(doc));
xmlFreeDoc(doc);
- if (config)
- return 1;
- else
- return 0;
+ return config;
}
+void config_read_settings(struct conf_config *config,
+ const char *path_override)
+{
+ struct conf_service *s = config->servers->service;
+ for (;s ; s = s->next)
+ {
+ init_settings(s);
+ if (path_override)
+ settings_read(s, path_override);
+ else if (s->settings)
+ settings_read(s, s->settings);
+ else if (config->servers->server_settings)
+ settings_read(s, config->servers->server_settings);
+ else
+ yaz_log(YLOG_WARN, "No settings for service");
+ }
+}
/*
* Local variables: