X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=ec87cafff457601301c9936e3df2a03ba6b1294d;hb=1498181abb059f78afc0ad4f7bcea0b5c13c7964;hp=ab84f54174697267ccfad26b0c743878ab43fffe;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index ab84f54..ec87caf 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2010 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 @@ -22,40 +22,60 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #include +#include #include #include -#include -#include -#include #include #include #include +#include +#include -#define CONFIG_NOEXTERNS +#include +#include +#if HAVE_UNISTD_H +#include +#endif +#include "ppmutex.h" +#include "incref.h" #include "pazpar2_config.h" +#include "settings.h" +#include "eventl.h" +#include "http.h" - -static NMEM nmem = 0; -static char confdir[256] = "."; - -struct conf_config *config = 0; - - -struct conf_metadata * conf_metadata_assign(NMEM nmem, - struct conf_metadata * metadata, - const char *name, - enum conf_metadata_type type, - enum conf_metadata_merge merge, - enum conf_setting_type setting, - int brief, - int termlist, - int rank, - int sortkey_offset) +struct conf_config { - if (!nmem || !metadata || !name) - return 0; + NMEM nmem; /* for conf_config and servers memory */ + struct conf_server *servers; + + int no_threads; + WRBUF confdir; + iochan_man_t iochan_man; + database_hosts_t database_hosts; +}; + + +static char *parse_settings(struct conf_config *config, + NMEM nmem, xmlNode *node); + +static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem, + xmlNode *node); + +static void conf_metadata_assign(NMEM nmem, + struct conf_metadata * metadata, + const char *name, + enum conf_metadata_type type, + enum conf_metadata_merge merge, + enum conf_setting_type setting, + int brief, + int termlist, + int rank, + int sortkey_offset, + enum conf_metadata_mergekey mt) +{ + assert(nmem && metadata && name); metadata->name = nmem_strdup(nmem, name); @@ -72,34 +92,47 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem, metadata->termlist = termlist; metadata->rank = rank; metadata->sortkey_offset = sortkey_offset; - return metadata; + metadata->mergekey = mt; } -struct conf_sortkey * conf_sortkey_assign(NMEM nmem, - struct conf_sortkey * sortkey, - const char *name, - enum conf_sortkey_type type) +static void conf_sortkey_assign(NMEM nmem, + struct conf_sortkey * sortkey, + const char *name, + enum conf_sortkey_type type) { - if (!nmem || !sortkey || !name) - return 0; + assert(nmem && sortkey && name); sortkey->name = nmem_strdup(nmem, name); sortkey->type = type; - - return sortkey; } -struct conf_service * conf_service_create(NMEM nmem, - int num_metadata, int num_sortkeys) +static struct conf_service *service_init(struct conf_server *server, + int num_metadata, int num_sortkeys, + const char *service_id) { struct conf_service * service = 0; + NMEM nmem = nmem_create(); - //assert(nmem); - service = nmem_malloc(nmem, sizeof(struct conf_service)); - + service->mutex = 0; + service->ref_count = 1; + service->nmem = nmem; + service->next = 0; + service->settings = 0; + service->databases = 0; + service->targetprofiles = 0; + service->server = server; + service->session_timeout = 60; /* default session timeout */ + service->z3950_session_timeout = 180; + service->z3950_operation_timeout = 30; + + service->relevance_pct = 0; + service->sort_pct = 0; + service->mergekey_pct = 0; + + service->id = service_id ? nmem_strdup(nmem, service_id) : 0; service->num_metadata = num_metadata; service->metadata = 0; if (service->num_metadata) @@ -112,21 +145,22 @@ struct conf_service * conf_service_create(NMEM nmem, service->sortkeys = nmem_malloc(nmem, sizeof(struct conf_sortkey) * service->num_sortkeys); - + service->dictionary = 0; return service; } -struct conf_metadata* conf_service_add_metadata(NMEM nmem, - struct conf_service *service, - int field_id, - const char *name, - enum conf_metadata_type type, - enum conf_metadata_merge merge, - enum conf_setting_type setting, - int brief, - int termlist, - int rank, - int sortkey_offset) +static struct conf_metadata* conf_service_add_metadata( + struct conf_service *service, + int field_id, + const char *name, + enum conf_metadata_type type, + enum conf_metadata_merge merge, + enum conf_setting_type setting, + int brief, + int termlist, + int rank, + int sortkey_offset, + enum conf_metadata_mergekey mt) { struct conf_metadata * md = 0; @@ -134,19 +168,19 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem, || field_id < 0 || !(field_id < service->num_metadata)) return 0; - //md = &((service->metadata)[field_id]); md = service->metadata + field_id; - md = conf_metadata_assign(nmem, md, name, type, merge, setting, - brief, termlist, rank, sortkey_offset); + conf_metadata_assign(service->nmem, md, name, type, merge, setting, + brief, termlist, rank, sortkey_offset, + mt); return md; } -struct conf_sortkey * conf_service_add_sortkey(NMEM nmem, - struct conf_service *service, - int field_id, - const char *name, - enum conf_sortkey_type type) +static struct conf_sortkey * conf_service_add_sortkey( + struct conf_service *service, + int field_id, + const char *name, + enum conf_sortkey_type type) { struct conf_sortkey * sk = 0; @@ -156,7 +190,7 @@ struct conf_sortkey * conf_service_add_sortkey(NMEM nmem, //sk = &((service->sortkeys)[field_id]); sk = service->sortkeys + field_id; - sk = conf_sortkey_assign(nmem, sk, name, type); + conf_sortkey_assign(service->nmem, sk, name, type); return sk; } @@ -195,12 +229,224 @@ int conf_service_sortkey_field_id(struct conf_service *service, return -1; } +static void conf_dir_path(struct conf_config *config, WRBUF w, const char *src) +{ + if (config->confdir && wrbuf_len(config->confdir) > 0 && + !yaz_is_abspath(src)) + { + wrbuf_printf(w, "%s/%s", wrbuf_cstr(config->confdir), src); + } + else + wrbuf_puts(w, src); +} +void service_destroy(struct conf_service *service) +{ + if (service) + { + if (!pazpar2_decref(&service->ref_count, service->mutex)) + { + pp2_charset_destroy(service->relevance_pct); + pp2_charset_destroy(service->sort_pct); + pp2_charset_destroy(service->mergekey_pct); + yaz_mutex_destroy(&service->mutex); + nmem_destroy(service->nmem); + } + } +} + +void service_incref(struct conf_service *service) +{ + yaz_log(YLOG_LOG, "service_incref. p=%p cnt=%d", service, + service->ref_count); + pazpar2_incref(&service->ref_count, service->mutex); +} -/* Code to parse configuration file */ -/* ==================================================== */ +static int parse_metadata(struct conf_service *service, xmlNode *n, + int *md_node, int *sk_node) +{ + xmlChar *xml_name = xmlGetProp(n, (xmlChar *) "name"); + xmlChar *xml_brief = xmlGetProp(n, (xmlChar *) "brief"); + xmlChar *xml_sortkey = xmlGetProp(n, (xmlChar *) "sortkey"); + xmlChar *xml_merge = xmlGetProp(n, (xmlChar *) "merge"); + xmlChar *xml_type = xmlGetProp(n, (xmlChar *) "type"); + xmlChar *xml_termlist = xmlGetProp(n, (xmlChar *) "termlist"); + xmlChar *xml_rank = xmlGetProp(n, (xmlChar *) "rank"); + xmlChar *xml_setting = xmlGetProp(n, (xmlChar *) "setting"); + xmlChar *xml_mergekey = xmlGetProp(n, (xmlChar *) "mergekey"); + + enum conf_metadata_type type = Metadata_type_generic; + enum conf_metadata_merge merge = Metadata_merge_no; + enum conf_setting_type setting = Metadata_setting_no; + enum conf_sortkey_type sk_type = Metadata_sortkey_relevance; + enum conf_metadata_mergekey mergekey_type = Metadata_mergekey_no; + int brief = 0; + int termlist = 0; + int rank = 0; + int sortkey_offset = 0; + + // now do the parsing logic + if (!xml_name) + { + yaz_log(YLOG_FATAL, "Must specify name in metadata element"); + return -1; + } + if (xml_brief) + { + if (!strcmp((const char *) xml_brief, "yes")) + brief = 1; + else if (strcmp((const char *) xml_brief, "no")) + { + yaz_log(YLOG_FATAL, "metadata/brief must be yes or no"); + return -1; + } + } + else + brief = 0; + + if (xml_termlist) + { + if (!strcmp((const char *) xml_termlist, "yes")) + termlist = 1; + else if (strcmp((const char *) xml_termlist, "no")) + { + yaz_log(YLOG_FATAL, "metadata/termlist must be yes or no"); + return -1; + } + } + else + termlist = 0; + + if (xml_rank) + rank = atoi((const char *) xml_rank); + else + rank = 0; + + if (xml_type) + { + if (!strcmp((const char *) xml_type, "generic")) + type = Metadata_type_generic; + else if (!strcmp((const char *) xml_type, "year")) + type = Metadata_type_year; + else if (!strcmp((const char *) xml_type, "date")) + type = Metadata_type_date; + else + { + yaz_log(YLOG_FATAL, + "Unknown value for metadata/type: %s", xml_type); + return -1; + } + } + else + type = Metadata_type_generic; + + if (xml_merge) + { + if (!strcmp((const char *) xml_merge, "no")) + merge = Metadata_merge_no; + else if (!strcmp((const char *) xml_merge, "unique")) + merge = Metadata_merge_unique; + else if (!strcmp((const char *) xml_merge, "longest")) + merge = Metadata_merge_longest; + else if (!strcmp((const char *) xml_merge, "range")) + merge = Metadata_merge_range; + else if (!strcmp((const char *) xml_merge, "all")) + merge = Metadata_merge_all; + else + { + yaz_log(YLOG_FATAL, + "Unknown value for metadata/merge: %s", xml_merge); + return -1; + } + } + else + merge = Metadata_merge_no; + + if (xml_setting) + { + if (!strcmp((const char *) xml_setting, "no")) + setting = Metadata_setting_no; + else if (!strcmp((const char *) xml_setting, "postproc")) + setting = Metadata_setting_postproc; + else if (!strcmp((const char *) xml_setting, "parameter")) + setting = Metadata_setting_parameter; + else + { + yaz_log(YLOG_FATAL, + "Unknown value for medadata/setting: %s", xml_setting); + return -1; + } + } + + // add a sortkey if so specified + if (xml_sortkey && strcmp((const char *) xml_sortkey, "no")) + { + if (merge == Metadata_merge_no) + { + yaz_log(YLOG_FATAL, + "Can't specify sortkey on a non-merged field"); + return -1; + } + if (!strcmp((const char *) xml_sortkey, "numeric")) + sk_type = Metadata_sortkey_numeric; + else if (!strcmp((const char *) xml_sortkey, "skiparticle")) + sk_type = Metadata_sortkey_skiparticle; + else + { + yaz_log(YLOG_FATAL, + "Unknown sortkey in metadata element: %s", + xml_sortkey); + return -1; + } + sortkey_offset = *sk_node; + + conf_service_add_sortkey(service, *sk_node, + (const char *) xml_name, sk_type); + + (*sk_node)++; + } + else + sortkey_offset = -1; + + if (xml_mergekey) + { + if (!strcmp((const char *) xml_mergekey, "required")) + mergekey_type = Metadata_mergekey_required; + else if (!strcmp((const char *) xml_mergekey, "optional")) + mergekey_type = Metadata_mergekey_optional; + else if (!strcmp((const char *) xml_mergekey, "no")) + mergekey_type = Metadata_mergekey_no; + else + { + yaz_log(YLOG_FATAL, "Unknown value for mergekey: %s", xml_mergekey); + return -1; + } + } + + + // metadata known, assign values + conf_service_add_metadata(service, *md_node, + (const char *) xml_name, + type, merge, setting, + brief, termlist, rank, sortkey_offset, + mergekey_type); + + xmlFree(xml_name); + xmlFree(xml_brief); + xmlFree(xml_sortkey); + xmlFree(xml_merge); + xmlFree(xml_type); + xmlFree(xml_termlist); + xmlFree(xml_rank); + xmlFree(xml_setting); + xmlFree(xml_mergekey); + (*md_node)++; + return 0; +} -static struct conf_service *parse_service(xmlNode *node) +static struct conf_service *service_create_static(struct conf_server *server, + xmlNode *node, + const char *service_id) { xmlNode *n; int md_node = 0; @@ -209,6 +455,7 @@ static struct conf_service *parse_service(xmlNode *node) struct conf_service *service = 0; int num_metadata = 0; int num_sortkeys = 0; + int got_settings = 0; // count num_metadata and num_sortkeys for (n = node->children; n; n = n->next) @@ -222,170 +469,107 @@ static struct conf_service *parse_service(xmlNode *node) xmlFree(sortkey); } - service = conf_service_create(nmem, num_metadata, num_sortkeys); + service = service_init(server, num_metadata, num_sortkeys, service_id); for (n = node->children; n; n = n->next) { if (n->type != XML_ELEMENT_NODE) continue; - if (!strcmp((const char *) n->name, (const char *) "metadata")) - { - xmlChar *xml_name = xmlGetProp(n, (xmlChar *) "name"); - xmlChar *xml_brief = xmlGetProp(n, (xmlChar *) "brief"); - xmlChar *xml_sortkey = xmlGetProp(n, (xmlChar *) "sortkey"); - xmlChar *xml_merge = xmlGetProp(n, (xmlChar *) "merge"); - xmlChar *xml_type = xmlGetProp(n, (xmlChar *) "type"); - xmlChar *xml_termlist = xmlGetProp(n, (xmlChar *) "termlist"); - xmlChar *xml_rank = xmlGetProp(n, (xmlChar *) "rank"); - xmlChar *xml_setting = xmlGetProp(n, (xmlChar *) "setting"); - - enum conf_metadata_type type = Metadata_type_generic; - enum conf_metadata_merge merge = Metadata_merge_no; - enum conf_setting_type setting = Metadata_setting_no; - enum conf_sortkey_type sk_type = Metadata_sortkey_relevance; - int brief = 0; - int termlist = 0; - int rank = 0; - int sortkey_offset = 0; - - // now do the parsing logic - if (!xml_name) - { - yaz_log(YLOG_FATAL, "Must specify name in metadata element"); - return 0; - } - if (xml_brief) + if (!strcmp((const char *) n->name, "timeout")) + { + xmlChar *src = xmlGetProp(n, (xmlChar *) "session"); + if (src) { - if (!strcmp((const char *) xml_brief, "yes")) - brief = 1; - else if (strcmp((const char *) xml_brief, "no")) + service->session_timeout = atoi((const char *) src); + xmlFree(src); + if (service->session_timeout < 9) { - yaz_log(YLOG_FATAL, "metadata/brief must be yes or no"); + yaz_log(YLOG_FATAL, "session timeout out of range"); return 0; } } - else - brief = 0; - - if (xml_termlist) + src = xmlGetProp(n, (xmlChar *) "z3950_operation"); + if (src) { - if (!strcmp((const char *) xml_termlist, "yes")) - termlist = 1; - else if (strcmp((const char *) xml_termlist, "no")) + service->z3950_operation_timeout = atoi((const char *) src); + xmlFree(src); + if (service->z3950_session_timeout < 9) { - yaz_log(YLOG_FATAL, "metadata/termlist must be yes or no"); + yaz_log(YLOG_FATAL, "Z39.50 operation timeout out of range"); return 0; } } - else - termlist = 0; - - if (xml_rank) - rank = atoi((const char *) xml_rank); - else - rank = 0; - - if (xml_type) + src = xmlGetProp(n, (xmlChar *) "z3950_session"); + if (src) { - if (!strcmp((const char *) xml_type, "generic")) - type = Metadata_type_generic; - else if (!strcmp((const char *) xml_type, "year")) - type = Metadata_type_year; - else if (!strcmp((const char *) xml_type, "date")) - type = Metadata_type_date; - else + service->z3950_session_timeout = atoi((const char *) src); + xmlFree(src); + if (service->z3950_session_timeout < 9) { - yaz_log(YLOG_FATAL, - "Unknown value for metadata/type: %s", xml_type); + yaz_log(YLOG_FATAL, "Z39.50 session timeout out of range"); return 0; } } + } + else if (!strcmp((const char *) n->name, "settings")) + got_settings++; + 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, "relevance")) + { + if (service->relevance_pct) + { + yaz_log(YLOG_LOG, "relevance may not repeat in service"); + return 0; + } else - type = Metadata_type_generic; - - if (xml_merge) { - if (!strcmp((const char *) xml_merge, "no")) - merge = Metadata_merge_no; - else if (!strcmp((const char *) xml_merge, "unique")) - merge = Metadata_merge_unique; - else if (!strcmp((const char *) xml_merge, "longest")) - merge = Metadata_merge_longest; - else if (!strcmp((const char *) xml_merge, "range")) - merge = Metadata_merge_range; - else if (!strcmp((const char *) xml_merge, "all")) - merge = Metadata_merge_all; - else - { - yaz_log(YLOG_FATAL, - "Unknown value for metadata/merge: %s", xml_merge); + service->relevance_pct = pp2_charset_create_xml(n); + if (!service->relevance_pct) return 0; - } + } + } + else if (!strcmp((const char *) n->name, "sort")) + { + if (service->sort_pct) + { + yaz_log(YLOG_LOG, "sort may not repeat in service"); + return 0; } else - merge = Metadata_merge_no; - - if (xml_setting) { - if (!strcmp((const char *) xml_setting, "no")) - setting = Metadata_setting_no; - else if (!strcmp((const char *) xml_setting, "postproc")) - setting = Metadata_setting_postproc; - else if (!strcmp((const char *) xml_setting, "parameter")) - setting = Metadata_setting_parameter; - else - { - yaz_log(YLOG_FATAL, - "Unknown value for medadata/setting: %s", xml_setting); + service->sort_pct = pp2_charset_create_xml(n); + if (!service->sort_pct) return 0; - } } - - // add a sortkey if so specified - if (xml_sortkey && strcmp((const char *) xml_sortkey, "no")) + } + else if (!strcmp((const char *) n->name, "mergekey")) + { + if (service->mergekey_pct) { - if (merge == Metadata_merge_no) - { - yaz_log(YLOG_FATAL, - "Can't specify sortkey on a non-merged field"); - return 0; - } - if (!strcmp((const char *) xml_sortkey, "numeric")) - sk_type = Metadata_sortkey_numeric; - else if (!strcmp((const char *) xml_sortkey, "skiparticle")) - sk_type = Metadata_sortkey_skiparticle; - else - { - yaz_log(YLOG_FATAL, - "Unknown sortkey in metadata element: %s", - xml_sortkey); - return 0; - } - sortkey_offset = sk_node; - - conf_service_add_sortkey(nmem, service, sk_node, - (const char *) xml_name, sk_type); - - sk_node++; + yaz_log(YLOG_LOG, "mergekey may not repeat in service"); + return 0; } else - sortkey_offset = -1; - - // metadata known, assign values - conf_service_add_metadata(nmem, service, md_node, - (const char *) xml_name, - type, merge, setting, - brief, termlist, rank, sortkey_offset); - - xmlFree(xml_name); - xmlFree(xml_brief); - xmlFree(xml_sortkey); - xmlFree(xml_merge); - xmlFree(xml_type); - xmlFree(xml_termlist); - xmlFree(xml_rank); - xmlFree(xml_setting); - md_node++; + { + service->mergekey_pct = pp2_charset_create_xml(n); + if (!service->mergekey_pct) + return 0; + } + } + else if (!strcmp((const char *) n->name, (const char *) "metadata")) + { + if (parse_metadata(service, n, &md_node, &sk_node)) + return 0; } else { @@ -393,16 +577,52 @@ static struct conf_service *parse_service(xmlNode *node) return 0; } } + if (got_settings) + { + int pass; + /* metadata has been read.. Consider now settings */ + init_settings(service); + for (pass = 1; pass <= 2; pass++) + { + for (n = node->children; n; n = n->next) + { + if (n->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) n->name, "settings")) + { + xmlChar *src = xmlGetProp(n, (xmlChar *) "src"); + if (src) + { + WRBUF w = wrbuf_alloc(); + conf_dir_path(server->config, w, (const char *) src); + settings_read_file(service, wrbuf_cstr(w), pass); + wrbuf_destroy(w); + xmlFree(src); + } + else + { + settings_read_node(service, n, pass); + } + } + } + } + } return service; } -static char *parse_settings(xmlNode *node) +static char *parse_settings(struct conf_config *config, + NMEM nmem, xmlNode *node) { xmlChar *src = xmlGetProp(node, (xmlChar *) "src"); char *r; if (src) - r = nmem_strdup(nmem, (const char *) 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"); @@ -412,10 +632,83 @@ static char *parse_settings(xmlNode *node) return r; } -static struct conf_server *parse_server(xmlNode *node) +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) + { + /* inherit settings from server */ + init_settings(s); + settings_read_file(s, server->server_settings, 1); + settings_read_file(s, server->server_settings, 2); + } + else + { + yaz_log(YLOG_WARN, "service '%s' has no settings", + s->id ? s->id : "unnamed"); + init_settings(s); + } + } + + /* use relevance/sort/mergekey from server if not defined + for this service.. */ + if (!s->relevance_pct) + { + if (server->relevance_pct) + { + s->relevance_pct = server->relevance_pct; + pp2_charset_incref(s->relevance_pct); + } + else + s->relevance_pct = pp2_charset_create(0); + } + + if (!s->sort_pct) + { + if (server->sort_pct) + { + s->sort_pct = server->sort_pct; + pp2_charset_incref(s->sort_pct); + } + else + s->sort_pct = pp2_charset_create(0); + } + + if (!s->mergekey_pct) + { + if (server->mergekey_pct) + { + s->mergekey_pct = server->mergekey_pct; + pp2_charset_incref(s->mergekey_pct); + } + else + s->mergekey_pct = pp2_charset_create(0); + } +} + +struct conf_service *service_create(struct conf_server *server, + xmlNode *node) +{ + struct conf_service *service = service_create_static(server, + node, 0); + if (service) + { + inherit_server_settings(service); + resolve_databases(service); + assert(service->mutex == 0); + pazpar2_mutex_create(&service->mutex, "conf"); + } + return service; +} + +static struct conf_server *server_create(struct conf_config *config, + NMEM nmem, xmlNode *node) { xmlNode *n; struct conf_server *server = nmem_malloc(nmem, sizeof(struct conf_server)); + xmlChar *server_id = xmlGetProp(node, (xmlChar *) "id"); server->host = 0; server->port = 0; @@ -423,12 +716,23 @@ static struct conf_server *parse_server(xmlNode *node) server->proxy_port = 0; server->myurl = 0; server->service = 0; + server->config = config; server->next = 0; - server->settings = 0; server->relevance_pct = 0; server->sort_pct = 0; server->mergekey_pct = 0; + server->server_settings = 0; + server->http_server = 0; + server->iochan_man = 0; + server->database_hosts = 0; + if (server_id) + { + server->server_id = nmem_strdup(nmem, (const char *)server_id); + xmlFree(server_id); + } + else + server->server_id = 0; for (n = node->children; n; n = n->next) { if (n->type != XML_ELEMENT_NODE) @@ -461,12 +765,12 @@ static struct conf_server *parse_server(xmlNode *node) } 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(n))) + if (!(server->server_settings = parse_settings(config, nmem, n))) return 0; } else if (!strcmp((const char *) n->name, "relevance")) @@ -489,10 +793,37 @@ static struct conf_server *parse_server(xmlNode *node) } else if (!strcmp((const char *) n->name, "service")) { - struct conf_service *s = parse_service(n); - if (!s) + char *service_id = (char *) + xmlGetProp(n, (xmlChar *) "id"); + + struct conf_service **sp = &server->service; + for (; *sp; sp = &(*sp)->next) + if ((*sp)->id && service_id && + 0 == strcmp((*sp)->id, service_id)) + { + yaz_log(YLOG_FATAL, "Duplicate service: %s", service_id); + break; + } + else if (!(*sp)->id && !service_id) + { + yaz_log(YLOG_FATAL, "Duplicate unnamed service"); + break; + } + + if (*sp) /* service already exist */ + { + xmlFree(service_id); return 0; - server->service = s; + } + else + { + struct conf_service *s = service_create_static(server, n, + service_id); + xmlFree(service_id); + if (!s) + return 0; + *sp = s; + } } else { @@ -500,26 +831,25 @@ static struct conf_server *parse_server(xmlNode *node) 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); + if (server->service) + { + struct conf_service *s; + for (s = server->service; s; s = s->next) + inherit_server_settings(s); + } return server; } -xsltStylesheet *conf_load_stylesheet(const char *fname) +WRBUF conf_get_fname(struct conf_config *config, const char *fname) { - char path[256]; - if (*fname == '/') - yaz_snprintf(path, sizeof(path), fname); - else - yaz_snprintf(path, sizeof(path), "%s/%s", confdir, fname); - return xsltParseStylesheetFile((xmlChar *) path); + WRBUF w = wrbuf_alloc(); + + conf_dir_path(config, w, fname); + return w; } -static struct conf_targetprofiles *parse_targetprofiles(xmlNode *node) +static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem, + xmlNode *node) { struct conf_targetprofiles *r = nmem_malloc(nmem, sizeof(*r)); xmlChar *type = xmlGetProp(node, (xmlChar *) "type"); @@ -555,13 +885,24 @@ static struct conf_targetprofiles *parse_targetprofiles(xmlNode *node) return r; } -static struct conf_config *parse_config(xmlNode *root) +struct conf_service *locate_service(struct conf_server *server, + const char *service_id) { - xmlNode *n; - struct conf_config *r = nmem_malloc(nmem, sizeof(struct conf_config)); + struct conf_service *s = server->service; + for (; s; s = s->next) + if (s->id && service_id && 0 == strcmp(s->id, service_id)) + break; + else if (!s->id && !service_id) + break; + if (s) + service_incref(s); + return s; +} - r->servers = 0; - r->targetprofiles = 0; + +static int parse_config(struct conf_config *config, xmlNode *root) +{ + xmlNode *n; for (n = root->children; n; n = n->next) { @@ -569,70 +910,221 @@ static struct conf_config *parse_config(xmlNode *root) continue; if (!strcmp((const char *) n->name, "server")) { - struct conf_server *tmp = parse_server(n); + struct conf_server *tmp = server_create(config, config->nmem, n); if (!tmp) - return 0; - tmp->next = r->servers; - r->servers = tmp; + return -1; + tmp->next = config->servers; + config->servers = tmp; } - else if (!strcmp((const char *) n->name, "targetprofiles")) + else if (!strcmp((const char *) n->name, "threads")) { - // It would be fun to be able to fix this sometime - if (r->targetprofiles) + xmlChar *number = xmlGetProp(n, (xmlChar *) "number"); + if (number) { - yaz_log(YLOG_FATAL, "Can't repeat targetprofiles"); - return 0; + config->no_threads = atoi((const char *) number); + xmlFree(number); } - if (!(r->targetprofiles = parse_targetprofiles(n))) - return 0; + } + else if (!strcmp((const char *) n->name, "targetprofiles")) + { + yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service"); + return -1; + } else { yaz_log(YLOG_FATAL, "Bad element: %s", n->name); - return 0; + return -1; } } - return r; + return 0; } -int read_config(const char *fname) +struct conf_config *config_create(const char *fname, int verbose) { xmlDoc *doc = xmlParseFile(fname); + xmlNode *n; const char *p; + int r; + NMEM nmem = nmem_create(); + struct conf_config *config = nmem_malloc(nmem, sizeof(struct conf_config)); - if (!nmem) // Initialize - { - nmem = nmem_create(); - xmlSubstituteEntitiesDefault(1); - xmlLoadExtDtdDefaultValue = 1; - } + xmlSubstituteEntitiesDefault(1); + xmlLoadExtDtdDefaultValue = 1; if (!doc) { yaz_log(YLOG_FATAL, "Failed to read %s", fname); - exit(1); + nmem_destroy(nmem); + return 0; } - if ((p = strrchr(fname, '/'))) + + config->nmem = nmem; + config->servers = 0; + config->no_threads = 0; + config->iochan_man = 0; + + config->confdir = wrbuf_alloc(); + if ((p = strrchr(fname, +#ifdef WIN32 + '\\' +#else + '/' +#endif + ))) { int len = p - fname; - if (len >= sizeof(confdir)) - len = sizeof(confdir)-1; - strncpy(confdir, fname, len); - confdir[len] = '\0'; + wrbuf_write(config->confdir, fname, len); + } + wrbuf_puts(config->confdir, ""); + + n = xmlDocGetRootElement(doc); + r = yaz_xml_include_simple(n, wrbuf_cstr(config->confdir)); + if (r == 0) /* OK */ + { + if (verbose) + { + yaz_log(YLOG_LOG, "Configuration %s after include processing", + fname); +#if LIBXML_VERSION >= 20600 + xmlDocFormatDump(yaz_log_file(), doc, 0); +#else + xmlDocDump(yaz_log_file(), doc); +#endif + } + r = parse_config(config, n); } - config = parse_config(xmlDocGetRootElement(doc)); xmlFreeDoc(doc); - if (config) - return 1; - else + if (r) + { + config_destroy(config); return 0; + } + return config; +} + +void server_destroy(struct conf_server *server) +{ + struct conf_service *s = server->service; + while (s) + { + struct conf_service *s_next = s->next; + service_destroy(s); + s = s_next; + } + pp2_charset_destroy(server->relevance_pct); + pp2_charset_destroy(server->sort_pct); + pp2_charset_destroy(server->mergekey_pct); + yaz_log(YLOG_LOG, "server_destroy server=%p", server); + http_server_destroy(server->http_server); +} + +void config_destroy(struct conf_config *config) +{ + if (config) + { + struct conf_server *server = config->servers; + iochan_man_destroy(&config->iochan_man); + while (server) + { + 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); + } +} + +void config_stop_listeners(struct conf_config *conf) +{ + struct conf_server *ser; + for (ser = conf->servers; ser; ser = ser->next) + http_close_server(ser); +} + +void config_process_events(struct conf_config *conf) +{ + 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); } +int config_start_listeners(struct conf_config *conf, + const char *listener_override) +{ + struct conf_server *ser; + + conf->iochan_man = iochan_man_create(conf->no_threads); + for (ser = conf->servers; ser; ser = ser->next) + { + WRBUF w = wrbuf_alloc(); + int r; + + ser->iochan_man = conf->iochan_man; + if (listener_override) + { + wrbuf_puts(w, listener_override); + listener_override = 0; /* only first server is overriden */ + } + else + { + if (ser->host) + wrbuf_puts(w, ser->host); + if (ser->port) + { + if (wrbuf_len(w)) + wrbuf_puts(w, ":"); + wrbuf_printf(w, "%d", ser->port); + } + } + r = http_init(wrbuf_cstr(w), ser); + wrbuf_destroy(w); + if (r) + return -1; + + w = wrbuf_alloc(); + if (ser->proxy_host || ser->proxy_port) + { + if (ser->proxy_host) + wrbuf_puts(w, ser->proxy_host); + if (ser->proxy_port) + { + if (wrbuf_len(w)) + wrbuf_puts(w, ":"); + wrbuf_printf(w, "%d", ser->proxy_port); + } + } + if (wrbuf_len(w)) + http_set_proxyaddr(wrbuf_cstr(w), ser); + wrbuf_destroy(w); + } + return 0; +} /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +