X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=2e5f984a32c6457e1897dcce66bc515d9bbb5776;hb=7aa45df8e1aeb4cd15434b945b66e56af3928fe0;hp=c9d15a91c138124a9c2719993eac3afa39ed8bd5;hpb=676ba59bffcd82ab85d692a5c87cf257593b8c31;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index c9d15a9..2e5f984 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,7 +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, @@ -68,7 +75,8 @@ static void conf_metadata_assign(NMEM nmem, int rank, int sortkey_offset, enum conf_metadata_mergekey mt, - const char *facetrule) + const char *facetrule, + const char *limitmap) { assert(nmem && metadata && name); @@ -89,6 +97,7 @@ static void conf_metadata_assign(NMEM nmem, metadata->sortkey_offset = sortkey_offset; metadata->mergekey = mt; metadata->facetrule = nmem_strdup_null(nmem, facetrule); + metadata->limitmap = nmem_strdup_null(nmem, limitmap); } @@ -103,7 +112,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) @@ -117,6 +125,7 @@ static struct conf_service *service_init(struct conf_server *server, 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; @@ -128,9 +137,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) @@ -153,7 +162,9 @@ static struct conf_metadata* conf_service_add_metadata( int rank, int sortkey_offset, enum conf_metadata_mergekey mt, - const char *facetrule) + const char *facetrule, + const char *limitmap + ) { struct conf_metadata * md = 0; @@ -164,11 +175,10 @@ 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; } - static struct conf_sortkey * conf_service_add_sortkey( struct conf_service *service, int field_id, @@ -178,7 +188,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]); @@ -188,7 +198,6 @@ static struct conf_sortkey * conf_service_add_sortkey( return sk; } - int conf_service_metadata_field_id(struct conf_service *service, const char * name) { @@ -196,16 +205,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) { @@ -214,11 +220,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; } @@ -239,6 +243,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); @@ -273,6 +278,7 @@ 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) @@ -304,6 +310,9 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, else if (!xmlStrcmp(attr->name, BAD_CAST "mergekey") && attr->children && attr->children->type == XML_TEXT_NODE) xml_mergekey = 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 if (!xmlStrcmp(attr->name, BAD_CAST "facetrule") && attr->children && attr->children->type == XML_TEXT_NODE) xml_icu_chain = attr->children->content; @@ -447,7 +456,7 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, (const char *) xml_name, type, merge, setting, brief, termlist, rank, sortkey_offset, - mergekey_type, (const char *) xml_icu_chain); + mergekey_type, (const char *) xml_icu_chain, (const char *) xml_limitmap); (*md_node)++; return 0; } @@ -551,6 +560,11 @@ 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 { yaz_log(YLOG_FATAL, "Bad element: %s", n->name); @@ -634,7 +648,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"); } @@ -659,7 +672,7 @@ static struct conf_server *server_create(struct conf_config *config, server->charsets = 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) @@ -897,7 +910,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, @@ -964,9 +977,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); } @@ -983,22 +995,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,