database_hosts_t database_hosts;
};
-
-static char *parse_settings(struct conf_config *config,
- NMEM nmem, xmlNode *node);
-
static void conf_metadata_assign(NMEM nmem,
struct conf_metadata * metadata,
const char *name,
sortkey->type = type;
}
-
static struct conf_service *service_init(struct conf_server *server,
int num_metadata, int num_sortkeys,
const char *service_id)
service->num_metadata = num_metadata;
service->metadata = 0;
if (service->num_metadata)
- service->metadata
- = nmem_malloc(nmem,
- sizeof(struct conf_metadata) * service->num_metadata);
+ service->metadata
+ = nmem_malloc(nmem,
+ sizeof(struct conf_metadata) * service->num_metadata);
service->num_sortkeys = num_sortkeys;
service->sortkeys = 0;
if (service->num_sortkeys)
return md;
}
-
static struct conf_sortkey * conf_service_add_sortkey(
struct conf_service *service,
int field_id,
struct conf_sortkey * sk = 0;
if (!service || !service->sortkeys || !service->num_sortkeys
- || field_id < 0 || !(field_id < service->num_sortkeys))
+ || field_id < 0 || !(field_id < service->num_sortkeys))
return 0;
//sk = &((service->sortkeys)[field_id]);
return sk;
}
-
int conf_service_metadata_field_id(struct conf_service *service,
const char * name)
{
if (!service || !service->metadata || !service->num_metadata)
return -1;
-
- for(i = 0; i < service->num_metadata; i++) {
+
+ for (i = 0; i < service->num_metadata; i++)
if (!strcmp(name, (service->metadata[i]).name))
return i;
- }
-
return -1;
}
-
int conf_service_sortkey_field_id(struct conf_service *service,
const char * name)
{
if (!service || !service->sortkeys || !service->num_sortkeys)
return -1;
- for(i = 0; i < service->num_sortkeys; i++) {
+ for (i = 0; i < service->num_sortkeys; i++)
if (!strcmp(name, (service->sortkeys[i]).name))
return i;
- }
-
return -1;
}
return service;
}
-static char *parse_settings(struct conf_config *config,
- NMEM nmem, xmlNode *node)
-{
- xmlChar *src = xmlGetProp(node, (xmlChar *) "src");
- char *r;
-
- if (src)
- {
- WRBUF w = wrbuf_alloc();
- conf_dir_path(config, w, (const char *) src);
- r = nmem_strdup(nmem, wrbuf_cstr(w));
- wrbuf_destroy(w);
- }
- else
- {
- yaz_log(YLOG_FATAL, "Must specify src in targetprofile");
- return 0;
- }
- xmlFree(src);
- return r;
-}
-
static void inherit_server_settings(struct conf_service *s)
{
struct conf_server *server = s->server;
if (!s->dictionary) /* service has no config settings ? */
{
- if (server->server_settings)
+ if (server->settings_fname)
{
/* inherit settings from server */
init_settings(s);
- settings_read_file(s, server->server_settings, 1);
- settings_read_file(s, server->server_settings, 2);
+ settings_read_file(s, server->settings_fname, 1);
+ settings_read_file(s, server->settings_fname, 2);
}
else
{
if (service)
{
inherit_server_settings(service);
- resolve_databases(service);
assert(service->mutex == 0);
pazpar2_mutex_create(&service->mutex, "conf");
}
server->config = config;
server->next = 0;
server->charsets = 0;
- server->server_settings = 0;
server->http_server = 0;
server->iochan_man = 0;
- server->database_hosts = 0;
+ server->database_hosts = config->database_hosts;
+ server->settings_fname = 0;
if (server_id)
{
}
else if (!strcmp((const char *) n->name, "settings"))
{
- if (server->server_settings)
+ xmlChar *src = xmlGetProp(n, (xmlChar *) "src");
+ WRBUF w;
+ if (!src)
{
- yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
+ yaz_log(YLOG_FATAL, "Missing src attribute for settings");
return 0;
}
- if (!(server->server_settings = parse_settings(config, nmem, n)))
+ if (server->settings_fname)
+ {
+ xmlFree(src);
+ yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
return 0;
+ }
+ w = wrbuf_alloc();
+ conf_dir_path(config, w, (const char *) src);
+ server->settings_fname = nmem_strdup(nmem, wrbuf_cstr(w));
+ wrbuf_destroy(w);
+ xmlFree(src);
}
else if (!strcmp((const char *) n->name, "icu_chain"))
{
config->servers = 0;
config->no_threads = 0;
config->iochan_man = 0;
- config->database_hosts = 0;
+ config->database_hosts = database_hosts_create();
config->confdir = wrbuf_alloc();
if ((p = strrchr(fname,
struct conf_server *s_next = server->next;
server_destroy(server);
server = s_next;
+ database_hosts_destroy(&config->database_hosts);
}
- database_hosts_destroy(&config->database_hosts);
-
wrbuf_destroy(config->confdir);
nmem_destroy(config->nmem);
}
{
struct conf_server *ser;
- conf->database_hosts = database_hosts_create();
for (ser = conf->servers; ser; ser = ser->next)
{
struct conf_service *s = ser->service;
- ser->database_hosts = conf->database_hosts;
-
for (;s ; s = s->next)
{
- resolve_databases(s);
assert(s->mutex == 0);
pazpar2_mutex_create(&s->mutex, "service");
}
http_mutex_init(ser);
}
- iochan_man_events(conf->iochan_man);
+ iochan_man_events(conf->iochan_man);
}
int config_start_listeners(struct conf_config *conf,