X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=2ceda8150278ed0154916b88c7bd0dc8f8df6951;hb=572de728d257c3d2e6b11d0f60713c81b004c406;hp=668d907118b066e33d6ef1bfb4d2f5f8000e6925;hpb=26e2bf146ed32bc205eb2b76cdc2974c75504c58;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index 668d907..2ceda81 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -22,43 +22,63 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #endif #include +#include #include #include -#include -#include -#include #include #include #include #include +#if HAVE_GLOB_H +#define USE_POSIX_GLOB 1 +#else +#define USE_POSIX_GLOB 0 +#endif + + +#if USE_POSIX_GLOB +#include +#endif +#include +#include +#if HAVE_UNISTD_H +#include +#endif #include "pazpar2_config.h" #include "settings.h" +#include "eventl.h" +#include "http.h" + +struct conf_config +{ + NMEM nmem; /* for conf_config and servers memory */ + struct conf_server *servers; + WRBUF confdir; +}; -static WRBUF confdir = 0; -static char *parse_settings(NMEM nmem, xmlNode *node); +static char *parse_settings(struct conf_config *config, + NMEM nmem, xmlNode *node); static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem, xmlNode *node); -static -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, - enum conf_metadata_mergekey mt) +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) { - if (!nmem || !metadata || !name) - return 0; + assert(nmem && metadata && name); metadata->name = nmem_strdup(nmem, name); @@ -76,41 +96,43 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem, metadata->rank = rank; metadata->sortkey_offset = sortkey_offset; metadata->mergekey = mt; - return metadata; } -static -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(int num_metadata, int num_sortkeys, - const char *service_id) +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->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; @@ -129,17 +151,18 @@ struct conf_service * conf_service_create(int num_metadata, int num_sortkeys, return service; } -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) +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; @@ -147,19 +170,19 @@ struct conf_metadata* conf_service_add_metadata(struct conf_service *service, || field_id < 0 || !(field_id < service->num_metadata)) return 0; - //md = &((service->metadata)[field_id]); md = service->metadata + field_id; - md = conf_metadata_assign(service->nmem, md, name, type, merge, setting, - brief, termlist, rank, sortkey_offset, - mt); + 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(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; @@ -169,7 +192,7 @@ struct conf_sortkey * conf_service_add_sortkey(struct conf_service *service, //sk = &((service->sortkeys)[field_id]); sk = service->sortkeys + field_id; - sk = conf_sortkey_assign(service->nmem, sk, name, type); + conf_sortkey_assign(service->nmem, sk, name, type); return sk; } @@ -208,12 +231,223 @@ 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) + { + assert(service->ref_count > 0); + service->ref_count--; + if (service->ref_count == 0) + { + pp2_charset_destroy(service->relevance_pct); + pp2_charset_destroy(service->sort_pct); + pp2_charset_destroy(service->mergekey_pct); + nmem_destroy(service->nmem); + } + } +} +void service_incref(struct conf_service *service) +{ + service->ref_count++; +} -/* 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, const char *service_id) +static struct conf_service *service_create_static(struct conf_server *server, + xmlNode *node, + const char *service_id) { xmlNode *n; int md_node = 0; @@ -222,6 +456,7 @@ static struct conf_service *parse_service(xmlNode *node, const char *service_id) 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) @@ -235,23 +470,50 @@ static struct conf_service *parse_service(xmlNode *node, const char *service_id) xmlFree(sortkey); } - service = conf_service_create(num_metadata, num_sortkeys, service_id); + 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, "settings")) + if (!strcmp((const char *) n->name, "timeout")) { - if (service->settings) + xmlChar *src = xmlGetProp(n, (xmlChar *) "session"); + if (src) { - yaz_log(YLOG_FATAL, "Can't repeat 'settings'"); - return 0; + service->session_timeout = atoi((const char *) src); + xmlFree(src); + if (service->session_timeout < 9) + { + yaz_log(YLOG_FATAL, "session timeout out of range"); + return 0; + } + } + src = xmlGetProp(n, (xmlChar *) "z3950_operation"); + if (src) + { + service->z3950_operation_timeout = atoi((const char *) src); + xmlFree(src); + if (service->z3950_session_timeout < 9) + { + yaz_log(YLOG_FATAL, "Z39.50 operation timeout out of range"); + return 0; + } + } + src = xmlGetProp(n, (xmlChar *) "z3950_session"); + if (src) + { + service->z3950_session_timeout = atoi((const char *) src); + xmlFree(src); + if (service->z3950_session_timeout < 9) + { + yaz_log(YLOG_FATAL, "Z39.50 session timeout out of range"); + return 0; + } } - service->settings = parse_settings(service->nmem, n); - if (!service->settings) - 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) @@ -263,174 +525,52 @@ static struct conf_service *parse_service(xmlNode *node, const char *service_id) parse_targetprofiles(service->nmem, n))) return 0; } - else if (!strcmp((const char *) n->name, (const char *) "metadata")) + else if (!strcmp((const char *) n->name, "relevance")) { - 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) + if (service->relevance_pct) { - yaz_log(YLOG_FATAL, "Must specify name in metadata element"); + yaz_log(YLOG_LOG, "relevance may not repeat in service"); return 0; } - 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 0; - } - } 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"); + service->relevance_pct = pp2_charset_create_xml(n); + if (!service->relevance_pct) return 0; - } } - 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 0; - } - } - else - type = Metadata_type_generic; - - if (xml_merge) + } + else if (!strcmp((const char *) n->name, "sort")) + { + if (service->sort_pct) { - 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 0; - } + 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( -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; - - if (xml_mergekey && strcmp((const char *) xml_mergekey, "no")) { - mergekey_type = Metadata_mergekey_yes; + service->mergekey_pct = pp2_charset_create_xml(n); + if (!service->mergekey_pct) + return 0; } - - - // 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); - md_node++; + } + else if (!strcmp((const char *) n->name, (const char *) "metadata")) + { + if (parse_metadata(service, n, &md_node, &sk_node)) + return 0; } else { @@ -438,24 +578,51 @@ service, sk_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(NMEM nmem, xmlNode *node) +static char *parse_settings(struct conf_config *config, + NMEM nmem, xmlNode *node) { xmlChar *src = xmlGetProp(node, (xmlChar *) "src"); char *r; if (src) { - if (yaz_is_abspath((const char *) src)) - r = nmem_strdup(nmem, (const char *) src); - else - { - r = nmem_malloc(nmem, - wrbuf_len(confdir) + strlen((const char *) src) + 2); - sprintf(r, "%s/%s", wrbuf_cstr(confdir), src); - } + WRBUF w = wrbuf_alloc(); + conf_dir_path(config, w, (const char *) src); + r = nmem_strdup(nmem, wrbuf_cstr(w)); + wrbuf_destroy(w); } else { @@ -466,7 +633,77 @@ static char *parse_settings(NMEM nmem, xmlNode *node) return r; } -static struct conf_server *parse_server(NMEM nmem, 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); + } + 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)); @@ -478,11 +715,12 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node) server->myurl = 0; server->proxy_addr = 0; server->service = 0; + server->config = config; server->next = 0; - server->server_settings = 0; server->relevance_pct = 0; server->sort_pct = 0; server->mergekey_pct = 0; + server->server_settings = 0; for (n = node->children; n; n = n->next) { @@ -521,7 +759,7 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node) yaz_log(YLOG_FATAL, "Can't repeat 'settings'"); return 0; } - if (!(server->server_settings = parse_settings(nmem, n))) + if (!(server->server_settings = parse_settings(config, nmem, n))) return 0; } else if (!strcmp((const char *) n->name, "relevance")) @@ -557,27 +795,25 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node) } else if (!(*sp)->id && !service_id) { - yaz_log(YLOG_FATAL, "Duplicate unnamed service"); + yaz_log(YLOG_FATAL, "Duplicate unnamed service '%s'", + service_id); break; } if (*sp) /* service already exist */ + { + xmlFree(service_id); return 0; + } else { - 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; - } + struct conf_service *s = service_create_static(server, n, + service_id); + xmlFree(service_id); + if (!s) + return 0; + *sp = s; } - xmlFree(service_id); } else { @@ -585,17 +821,22 @@ static struct conf_server *parse_server(NMEM nmem, xmlNode *node) return 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_service *service, const char *fname) { - char path[256]; - if (yaz_is_abspath(fname)) - yaz_snprintf(path, sizeof(path), fname); - else - yaz_snprintf(path, sizeof(path), "%s/%s", wrbuf_cstr(confdir), fname); - return xsltParseStylesheetFile((xmlChar *) path); + struct conf_config *config = service->server->config; + WRBUF w = wrbuf_alloc(); + + conf_dir_path(config, w, fname); + return w; } static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem, @@ -648,14 +889,9 @@ struct conf_service *locate_service(struct conf_server *server, } -static struct conf_config *parse_config(xmlNode *root) +static int parse_config(struct conf_config *config, xmlNode *root) { - NMEM nmem = nmem_create(); xmlNode *n; - struct conf_config *r = nmem_malloc(nmem, sizeof(struct conf_config)); - - r->nmem = nmem; - r->servers = 0; for (n = root->children; n; n = n->next) { @@ -663,41 +899,157 @@ static struct conf_config *parse_config(xmlNode *root) continue; if (!strcmp((const char *) n->name, "server")) { - struct conf_server *tmp = parse_server(nmem, 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")) { yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service"); - return 0; + return -1; } else { yaz_log(YLOG_FATAL, "Bad element: %s", n->name); - return 0; + return -1; } } - return r; + return 0; +} + +static int process_config_includes(struct conf_config *config, xmlNode *n); + +static int config_include_one(struct conf_config *config, xmlNode **sib, + const char *path) +{ + struct stat st; + if (stat(path, &st) < 0) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "stat %s", path); + return -1; + } + else + { + if ((st.st_mode & S_IFMT) == S_IFREG) + { + xmlDoc *doc = xmlParseFile(path); + if (doc) + { + xmlNodePtr t = xmlDocGetRootElement(doc); + int ret = process_config_includes(config, t); + *sib = xmlAddNextSibling(*sib, xmlCopyNode(t, 1)); + xmlFreeDoc(doc); + if (ret) + return -1; + } + else + { + yaz_log(YLOG_FATAL, "Could not parse %s", path); + return -1; + } + } + } + return 0; } -struct conf_config *read_config(const char *fname) +static int config_include_src(struct conf_config *config, xmlNode **np, + const char *src) +{ + int ret = 0; /* return code. OK so far */ + WRBUF w = wrbuf_alloc(); + xmlNodePtr sib; /* our sibling that we append */ + xmlNodePtr c; /* tmp node */ + + wrbuf_printf(w, " begin include src=\"%s\" ", src); + + /* replace include element with a 'begin' comment */ + sib = xmlNewComment((const xmlChar *) wrbuf_cstr(w)); + xmlReplaceNode(*np, sib); + + xmlFreeNode(*np); + + wrbuf_rewind(w); + conf_dir_path(config, w, src); +#if USE_POSIX_GLOB + { + size_t i; + glob_t glob_res; + glob(wrbuf_cstr(w), 0 /* flags */, 0 /* errfunc */, &glob_res); + + for (i = 0; ret == 0 && i < glob_res.gl_pathc; i++) + { + const char *path = glob_res.gl_pathv[i]; + ret = config_include_one(config, &sib, path); + } + globfree(&glob_res); + } +#else + ret = config_include_one(config, &sib, wrbuf_cstr(w)); +#endif + wrbuf_rewind(w); + wrbuf_printf(w, " end include src=\"%s\" ", src); + c = xmlNewComment((const xmlChar *) wrbuf_cstr(w)); + sib = xmlAddNextSibling(sib, c); + + *np = sib; + wrbuf_destroy(w); + return ret; +} + +static int process_config_includes(struct conf_config *config, xmlNode *n) +{ + for (; n; n = n->next) + { + if (n->type == XML_ELEMENT_NODE) + { + if (!strcmp((const char *) n->name, "include")) + { + xmlChar *src = xmlGetProp(n, (xmlChar *) "src"); + if (src) + { + int ret = config_include_src(config, &n, + (const char *) src); + xmlFree(src); + if (ret) + return ret; + + } + } + else + { + if (process_config_includes(config, n->children)) + return -1; + } + } + } + return 0; +} + +struct conf_config *config_create(const char *fname, int verbose) { xmlDoc *doc = xmlParseFile(fname); + xmlNode *n; const char *p; - struct conf_config *config; + int r; + NMEM nmem = nmem_create(); + struct conf_config *config = nmem_malloc(nmem, sizeof(struct conf_config)); xmlSubstituteEntitiesDefault(1); xmlLoadExtDtdDefaultValue = 1; if (!doc) { yaz_log(YLOG_FATAL, "Failed to read %s", fname); - exit(1); + nmem_destroy(nmem); + return 0; } - confdir = wrbuf_alloc(); + + config->nmem = nmem; + config->servers = 0; + + config->confdir = wrbuf_alloc(); if ((p = strrchr(fname, #ifdef WIN32 '\\' @@ -707,31 +1059,130 @@ struct conf_config *read_config(const char *fname) ))) { int len = p - fname; - wrbuf_write(confdir, fname, len); + wrbuf_write(config->confdir, fname, len); + } + wrbuf_puts(config->confdir, ""); + + n = xmlDocGetRootElement(doc); + r = process_config_includes(config, n); + 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); } - wrbuf_puts(confdir, ""); - config = parse_config(xmlDocGetRootElement(doc)); xmlFreeDoc(doc); + if (r) + { + config_destroy(config); + return 0; + } return config; } -void config_read_settings(struct conf_config *config, - const char *path_override) +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); +} + +void config_destroy(struct conf_config *config) +{ + if (config) + { + struct conf_server *server = config->servers; + while (server) + { + struct conf_server *s_next = server->next; + server_destroy(server); + server = s_next; + } + wrbuf_destroy(config->confdir); + nmem_destroy(config->nmem); + } +} + +void config_stop_listeners(struct conf_config *conf) { - 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); + struct conf_server *ser; + for (ser = conf->servers; ser; ser = ser->next) + http_close_server(ser); +} + +void config_start_databases(struct conf_config *conf) +{ + struct conf_server *ser; + for (ser = conf->servers; ser; ser = ser->next) + { + struct conf_service *s = ser->service; + for (;s ; s = s->next) + resolve_databases(s); + } +} + +int config_start_listeners(struct conf_config *conf, + const char *listener_override) +{ + struct conf_server *ser; + for (ser = conf->servers; ser; ser = ser->next) + { + WRBUF w = wrbuf_alloc(); + int r; + if (listener_override) + { + wrbuf_puts(w, listener_override); + listener_override = 0; /* only first server is overriden */ + } else - yaz_log(YLOG_WARN, "No settings for service"); + { + 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; } /*