X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpazpar2_config.c;h=dd1c5709a28852779aa95c451821e84f5765ad87;hb=e7aa4584e25203b0da7839cf23011e89b6af6ced;hp=8fec8cce2d4bd5baee33414334bbd2700855ace8;hpb=937656d6d8dce23953dbc6eae4d854ad580f8876;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index 8fec8cc..dd1c570 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -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,10 +57,13 @@ struct conf_config database_hosts_t database_hosts; }; - -static char *parse_settings(struct conf_config *config, - NMEM nmem, xmlNode *node); - +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, @@ -71,7 +75,7 @@ static void conf_metadata_assign(NMEM nmem, int rank, int sortkey_offset, enum conf_metadata_mergekey mt, - const char *icu_chain) + const char *facetrule) { assert(nmem && metadata && name); @@ -91,7 +95,7 @@ static void conf_metadata_assign(NMEM nmem, metadata->rank = rank; metadata->sortkey_offset = sortkey_offset; metadata->mergekey = mt; - metadata->icu_chain = nmem_strdup_null(nmem, icu_chain); + metadata->facetrule = nmem_strdup_null(nmem, facetrule); } @@ -106,7 +110,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,8 +122,8 @@ 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->xslt_list = 0; service->server = server; service->session_timeout = 60; /* default session timeout */ service->z3950_session_timeout = 180; @@ -132,9 +135,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) @@ -157,7 +160,7 @@ static struct conf_metadata* conf_service_add_metadata( int rank, int sortkey_offset, enum conf_metadata_mergekey mt, - const char *icu_chain) + const char *facetrule) { struct conf_metadata * md = 0; @@ -168,11 +171,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, icu_chain); + mt, facetrule); return md; } - static struct conf_sortkey * conf_service_add_sortkey( struct conf_service *service, int field_id, @@ -182,7 +184,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 +194,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 +201,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 +216,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; } @@ -243,6 +239,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); @@ -263,7 +260,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; @@ -309,7 +305,7 @@ 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 "icu_chain") && + else if (!xmlStrcmp(attr->name, BAD_CAST "facetrule") && attr->children && attr->children->type == XML_TEXT_NODE) xml_icu_chain = attr->children->content; else @@ -405,6 +401,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, @@ -555,6 +552,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); @@ -594,39 +596,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 +640,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 +662,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 +706,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 +902,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 +969,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 +987,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,