X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=c6567bd2a090eff0f0d0cc9ff2e1d4ab52910f37;hb=646158a86d80e5ef0221ef7d7ce2cfc6ba31eacc;hp=8a7b651ce6ee4b2ca4d2c71e90e1a0838f8504de;hpb=4d9f530309235e8c78d50f82196f135c3127c064;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index 8a7b651..c6567bd 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -56,10 +56,6 @@ struct conf_config 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, @@ -106,7 +102,6 @@ static void conf_sortkey_assign(NMEM nmem, sortkey->type = type; } - static struct conf_service *service_init(struct conf_server *server, int num_metadata, int num_sortkeys, const char *service_id) @@ -119,7 +114,6 @@ static struct conf_service *service_init(struct conf_server *server, service->ref_count = 1; service->nmem = nmem; service->next = 0; - service->settings = 0; service->databases = 0; service->server = server; service->session_timeout = 60; /* default session timeout */ @@ -132,9 +126,9 @@ static struct conf_service *service_init(struct conf_server *server, 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) @@ -172,7 +166,6 @@ static struct conf_metadata* conf_service_add_metadata( return md; } - static struct conf_sortkey * conf_service_add_sortkey( struct conf_service *service, int field_id, @@ -182,7 +175,7 @@ static struct conf_sortkey * conf_service_add_sortkey( 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]); @@ -192,7 +185,6 @@ static struct conf_sortkey * conf_service_add_sortkey( return sk; } - int conf_service_metadata_field_id(struct conf_service *service, const char * name) { @@ -200,16 +192,13 @@ int conf_service_metadata_field_id(struct conf_service *service, 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) { @@ -218,11 +207,9 @@ int conf_service_sortkey_field_id(struct conf_service *service, 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; } @@ -263,7 +250,6 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, 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; @@ -405,6 +391,7 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, // add a sortkey if so specified if (xml_sortkey && strcmp((const char *) xml_sortkey, "no")) { + enum conf_sortkey_type sk_type; if (merge == Metadata_merge_no) { yaz_log(YLOG_FATAL, @@ -594,39 +581,17 @@ static struct conf_service *service_create_static(struct conf_server *server, 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 { @@ -660,7 +625,6 @@ struct conf_service *service_create(struct conf_server *server, if (service) { inherit_server_settings(service); - resolve_databases(service); assert(service->mutex == 0); pazpar2_mutex_create(&service->mutex, "conf"); } @@ -683,10 +647,10 @@ static struct conf_server *server_create(struct conf_config *config, 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) { @@ -727,13 +691,24 @@ static struct conf_server *server_create(struct conf_config *config, } 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")) { @@ -912,7 +887,7 @@ struct conf_config *config_create(const char *fname, int verbose) 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, @@ -979,9 +954,8 @@ void config_destroy(struct conf_config *config) 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); } @@ -998,22 +972,18 @@ 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); + iochan_man_events(conf->iochan_man); } int config_start_listeners(struct conf_config *conf,