X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=b2064f90b51cb488c3313342cfd910ce9f56488e;hb=1a3f3cfb2f6aeb743716924d9081d6dce981b49f;hp=ba1e55ab02adb94db71ef2c92d7ca7d64ea58be6;hpb=d65081fd86127344075a112002adbfa32ff88f11;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index ba1e55a..b2064f9 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 Index Data + Copyright (C) 2006-2012 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 @@ -41,6 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "ppmutex.h" #include "incref.h" #include "pazpar2_config.h" +#include "service_xslt.h" #include "settings.h" #include "eventl.h" #include "http.h" @@ -56,6 +57,13 @@ struct conf_config database_hosts_t database_hosts; }; +struct service_xslt +{ + char *id; + xsltStylesheetPtr xsp; + struct service_xslt *next; +}; + static void conf_metadata_assign(NMEM nmem, struct conf_metadata * metadata, const char *name, @@ -64,10 +72,11 @@ static void conf_metadata_assign(NMEM nmem, enum conf_setting_type setting, int brief, int termlist, - int rank, + const char *rank, int sortkey_offset, enum conf_metadata_mergekey mt, - const char *facetrule) + const char *facetrule, + const char *limitmap) { assert(nmem && metadata && name); @@ -84,10 +93,11 @@ static void conf_metadata_assign(NMEM nmem, metadata->setting = setting; metadata->brief = brief; metadata->termlist = termlist; - metadata->rank = rank; + metadata->rank = nmem_strdup_null(nmem, rank); metadata->sortkey_offset = sortkey_offset; metadata->mergekey = mt; metadata->facetrule = nmem_strdup_null(nmem, facetrule); + metadata->limitmap = nmem_strdup_null(nmem, limitmap); } @@ -102,19 +112,21 @@ static void conf_sortkey_assign(NMEM nmem, sortkey->type = type; } -static struct conf_service *service_init(struct conf_server *server, +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(); + service = nmem_malloc(nmem, sizeof(struct conf_service)); service->mutex = 0; service->ref_count = 1; service->nmem = nmem; service->next = 0; service->databases = 0; + service->xslt_list = 0; service->server = server; service->session_timeout = 60; /* default session timeout */ service->z3950_session_timeout = 180; @@ -123,7 +135,19 @@ static struct conf_service *service_init(struct conf_server *server, service->charsets = 0; service->id = service_id ? nmem_strdup(nmem, service_id) : 0; + // Setup a dictionary from server. + service->dictionary = 0; + + service->settings = nmem_malloc(nmem, sizeof(*service->settings)); + service->settings->num_settings = PZ_MAX_EOF; + service->settings->settings = nmem_malloc(nmem, sizeof(struct setting*) * service->settings->num_settings); + memset(service->settings->settings, 0, sizeof(struct setting*) * service->settings->num_settings); + // inherit_server_settings_values(service); + + service->next = 0; + service->num_metadata = num_metadata; + service->metadata = 0; if (service->num_metadata) service->metadata @@ -135,7 +159,8 @@ static struct conf_service *service_init(struct conf_server *server, service->sortkeys = nmem_malloc(nmem, sizeof(struct conf_sortkey) * service->num_sortkeys); - service->dictionary = 0; + + return service; } @@ -148,10 +173,12 @@ static struct conf_metadata* conf_service_add_metadata( enum conf_setting_type setting, int brief, int termlist, - int rank, + const char *rank, int sortkey_offset, enum conf_metadata_mergekey mt, - const char *facetrule) + const char *facetrule, + const char *limitmap + ) { struct conf_metadata * md = 0; @@ -162,7 +189,7 @@ static struct conf_metadata* conf_service_add_metadata( md = service->metadata + field_id; conf_metadata_assign(service->nmem, md, name, type, merge, setting, brief, termlist, rank, sortkey_offset, - mt, facetrule); + mt, facetrule, limitmap); return md; } @@ -230,6 +257,7 @@ void service_destroy(struct conf_service *service) { if (!pazpar2_decref(&service->ref_count, service->mutex)) { + service_xslt_destroy(service); pp2_charset_fact_destroy(service->charsets); yaz_mutex_destroy(&service->mutex); nmem_destroy(service->nmem); @@ -253,7 +281,6 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, enum conf_metadata_mergekey mergekey_type = Metadata_mergekey_no; int brief = 0; int termlist = 0; - int rank = 0; int sortkey_offset = 0; xmlChar *xml_name = 0; xmlChar *xml_brief = 0; @@ -264,7 +291,9 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, xmlChar *xml_rank = 0; xmlChar *xml_setting = 0; xmlChar *xml_mergekey = 0; + xmlChar *xml_limitmap = 0; xmlChar *xml_icu_chain = 0; + struct _xmlAttr *attr; for (attr = n->properties; attr; attr = attr->next) { @@ -298,6 +327,9 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, else if (!xmlStrcmp(attr->name, BAD_CAST "facetrule") && attr->children && attr->children->type == XML_TEXT_NODE) xml_icu_chain = attr->children->content; + else if (!xmlStrcmp(attr->name, BAD_CAST "limitmap") && + attr->children && attr->children->type == XML_TEXT_NODE) + xml_limitmap = attr->children->content; else { yaz_log(YLOG_FATAL, "Unknown metadata attribute '%s'", attr->name); @@ -333,9 +365,6 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, } } - if (xml_rank) - rank = atoi((const char *) xml_rank); - if (xml_type) { if (!strcmp((const char *) xml_type, "generic")) @@ -437,8 +466,11 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, conf_service_add_metadata(service, *md_node, (const char *) xml_name, type, merge, setting, - brief, termlist, rank, sortkey_offset, - mergekey_type, (const char *) xml_icu_chain); + brief, termlist, + (const char *) xml_rank, sortkey_offset, + mergekey_type, + (const char *) xml_icu_chain, + (const char *) xml_limitmap); (*md_node)++; return 0; } @@ -542,6 +574,20 @@ static struct conf_service *service_create_static(struct conf_server *server, if (parse_metadata(service, n, &md_node, &sk_node)) return 0; } + else if (!strcmp((const char *) n->name, (const char *) "xslt")) + { + if (service_xslt_config(service, n)) + return 0; + } + else if (!strcmp((const char *) n->name, (const char *) "set")) + { + xmlChar *name= xmlGetProp(n, (xmlChar *) "name"); + xmlChar *value = xmlGetProp(n, (xmlChar *) "value"); + if (service->dictionary && name && value) { + yaz_log(YLOG_DEBUG, "service set: %s=%s (Not implemented)", (char *) name, (char *) value); + //service_aply_setting(service, name, value); + } + } else { yaz_log(YLOG_FATAL, "Bad element: %s", n->name); @@ -561,19 +607,22 @@ static struct conf_service *service_create_static(struct conf_server *server, continue; if (!strcmp((const char *) n->name, "settings")) { + int ret; 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); + ret = settings_read_file(service, wrbuf_cstr(w), pass); wrbuf_destroy(w); xmlFree(src); } else { - settings_read_node(service, n, pass); + ret = settings_read_node(service, n, pass); } + if (ret) + return 0; } } } @@ -581,8 +630,9 @@ static struct conf_service *service_create_static(struct conf_server *server, return service; } -static void inherit_server_settings(struct conf_service *s) +static int inherit_server_settings(struct conf_service *s) { + int ret = 0; struct conf_server *server = s->server; if (!s->dictionary) /* service has no config settings ? */ { @@ -590,13 +640,14 @@ static void inherit_server_settings(struct conf_service *s) { /* inherit settings from server */ init_settings(s); - settings_read_file(s, server->settings_fname, 1); - settings_read_file(s, server->settings_fname, 2); + if (settings_read_file(s, server->settings_fname, 1)) + ret = -1; + if (settings_read_file(s, server->settings_fname, 2)) + ret = -1; } else { - yaz_log(YLOG_WARN, "service '%s' has no settings", - s->id ? s->id : "unnamed"); + yaz_log(YLOG_WARN, "server '%s' has no settings", s->id ? s->id : "unnamed"); init_settings(s); } } @@ -615,17 +666,16 @@ static void inherit_server_settings(struct conf_service *s) s->charsets = pp2_charset_fact_create(); } } + return ret; } struct conf_service *service_create(struct conf_server *server, xmlNode *node) { - struct conf_service *service = service_create_static(server, - node, 0); + 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"); } @@ -979,7 +1029,6 @@ void config_process_events(struct conf_config *conf) for (;s ; s = s->next) { - resolve_databases(s); assert(s->mutex == 0); pazpar2_mutex_create(&s->mutex, "service"); }