int no_threads;
WRBUF confdir;
iochan_man_t iochan_man;
- database_hosts_t database_hosts;
};
struct service_xslt
|| !strcmp((const char *) n->name, "facet"))
{
- yaz_log(YLOG_FATAL, "No longer supported: <%s>", n->name);
- yaz_log(YLOG_LOG, "Use <icu_chain id=\"%s\">.. instead", n->name);
- return 0;
+ if (!service->charsets)
+ service->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(service->charsets, n,
+ (const char *) n->name))
+ {
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
+ return 0;
+ }
}
else if (!strcmp((const char *) n->name, (const char *) "metadata"))
{
server->charsets = 0;
server->http_server = 0;
server->iochan_man = 0;
- server->database_hosts = config->database_hosts;
server->settings_fname = 0;
if (server_id)
|| !strcmp((const char *) n->name, "mergekey")
|| !strcmp((const char *) n->name, "facet"))
{
- yaz_log(YLOG_FATAL, "No longer supported: <%s>", n->name);
- yaz_log(YLOG_LOG, "Use <icu_chain id=\"%s\">.. instead", n->name);
- return 0;
+ if (!server->charsets)
+ server->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(server->charsets, n,
+ (const char *) n->name))
+ {
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
+ return 0;
+ }
}
else if (!strcmp((const char *) n->name, "service"))
{
config->servers = 0;
config->no_threads = 0;
config->iochan_man = 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);
}
wrbuf_destroy(config->confdir);
nmem_destroy(config->nmem);