X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconfig.c;h=2b4454764feef29c45cb6a3a84f30dc3d2f7a855;hb=e107b0011a295ccc61502d6e5ea79d9125a3fbb4;hp=590794c0e699b0da9ea0071d04ec849f0ffc6246;hpb=3670a21abc40afe784b2127c4d831471761747a0;p=pazpar2-moved-to-github.git diff --git a/src/config.c b/src/config.c index 590794c..2b44547 100644 --- a/src/config.c +++ b/src/config.c @@ -1,7 +1,5 @@ -/* $Id: config.c,v 1.28 2007-04-20 14:37:17 marc Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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 @@ -14,12 +12,12 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ -/* $Id: config.c,v 1.28 2007-04-20 14:37:17 marc Exp $ */ +/* $Id: config.c,v 1.42 2007-10-31 05:29:08 quinn Exp $ */ #include @@ -35,10 +33,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#include #define CONFIG_NOEXTERNS #include "config.h" + static NMEM nmem = 0; static char confdir[256] = "."; @@ -50,6 +50,7 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem, const char *name, enum conf_metadata_type type, enum conf_metadata_merge merge, + enum conf_setting_type setting, int brief, int termlist, int rank, @@ -59,13 +60,20 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem, return 0; metadata->name = nmem_strdup(nmem, name); + metadata->type = type; - metadata->merge = merge; + + // enforcing that type_year is always range_merge + if (metadata->type == Metadata_type_year) + metadata->merge = Metadata_merge_range; + else + metadata->merge = merge; + + metadata->setting = setting; metadata->brief = brief; metadata->termlist = termlist; metadata->rank = rank; metadata->sortkey_offset = sortkey_offset; - return metadata; } @@ -106,15 +114,17 @@ struct conf_service * conf_service_create(NMEM nmem, service->sortkeys = nmem_malloc(nmem, sizeof(struct conf_sortkey) * service->num_sortkeys); + return service; } struct conf_metadata* conf_service_add_metadata(NMEM nmem, struct conf_service *service, - int position, + 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, @@ -123,12 +133,12 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem, struct conf_metadata * md = 0; if (!service || !service->metadata || !service->num_metadata - || position < 0 || !(position < service->num_metadata)) + || field_id < 0 || !(field_id < service->num_metadata)) return 0; - //md = &((service->metadata)[position]); - md = service->metadata + position; - md = conf_metadata_assign(nmem, md, name, type, merge, + //md = &((service->metadata)[field_id]); + md = service->metadata + field_id; + md = conf_metadata_assign(nmem, md, name, type, merge, setting, brief, termlist, rank, sortkey_offset); return md; } @@ -136,24 +146,56 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem, struct conf_sortkey * conf_service_add_sortkey(NMEM nmem, struct conf_service *service, - int position, + int field_id, const char *name, enum conf_sortkey_type type) { struct conf_sortkey * sk = 0; if (!service || !service->sortkeys || !service->num_sortkeys - || position < 0 || !(position < service->num_sortkeys)) + || field_id < 0 || !(field_id < service->num_sortkeys)) return 0; - //sk = &((service->sortkeys)[position]); - sk = service->sortkeys + position; + //sk = &((service->sortkeys)[field_id]); + sk = service->sortkeys + field_id; sk = conf_sortkey_assign(nmem, sk, name, type); return sk; } +int conf_service_metadata_field_id(struct conf_service *service, + const char * name) +{ + int i = 0; + + if (!service || !service->metadata || !service->num_metadata) + return -1; + + 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) +{ + int i = 0; + + if (!service || !service->sortkeys || !service->num_sortkeys) + return -1; + + for(i = 0; i < service->num_sortkeys; i++) { + if (!strcmp(name, (service->sortkeys[i]).name)) + return i; + } + + return -1; +}; @@ -197,14 +239,16 @@ static struct conf_service *parse_service(xmlNode *node) 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"); 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; int brief = 0; int termlist = 0; int rank = 0; int sortkey_offset = 0; - enum conf_sortkey_type sk_type = Metadata_sortkey_relevance; // now do the parsing logic if (!xml_name) @@ -249,9 +293,12 @@ static struct conf_service *parse_service(xmlNode *node) 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); + yaz_log(YLOG_FATAL, + "Unknown value for metadata/type: %s", xml_type); return 0; } } @@ -280,6 +327,22 @@ static struct conf_service *parse_service(xmlNode *node) 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 0; + } + } + // add a sortkey if so specified if (xml_sortkey && strcmp((const char *) xml_sortkey, "no")) { @@ -313,7 +376,7 @@ static struct conf_service *parse_service(xmlNode *node) // metadata known, assign values conf_service_add_metadata(nmem, service, md_node, (const char *) xml_name, - type, merge, + type, merge, setting, brief, termlist, rank, sortkey_offset); xmlFree(xml_name); @@ -353,18 +416,19 @@ static char *parse_settings(xmlNode *node) static struct conf_server *parse_server(xmlNode *node) { xmlNode *n; - struct conf_server *r = nmem_malloc(nmem, sizeof(struct conf_server)); - - r->host = 0; - r->port = 0; - r->proxy_host = 0; - r->proxy_port = 0; - r->myurl = 0; - r->zproxy_host = 0; - r->zproxy_port = 0; - r->service = 0; - r->next = 0; - r->settings = 0; + struct conf_server *server = nmem_malloc(nmem, sizeof(struct conf_server)); + + server->host = 0; + server->port = 0; + server->proxy_host = 0; + server->proxy_port = 0; + server->myurl = 0; + server->service = 0; + server->next = 0; + server->settings = 0; + server->relevance_pct = 0; + server->sort_pct = 0; + server->mergekey_pct = 0; for (n = node->children; n; n = n->next) { @@ -375,9 +439,9 @@ static struct conf_server *parse_server(xmlNode *node) xmlChar *port = xmlGetProp(n, (xmlChar *) "port"); xmlChar *host = xmlGetProp(n, (xmlChar *) "host"); if (port) - r->port = atoi((const char *) port); + server->port = atoi((const char *) port); if (host) - r->host = nmem_strdup(nmem, (const char *) host); + server->host = nmem_strdup(nmem, (const char *) host); xmlFree(port); xmlFree(host); } @@ -387,11 +451,11 @@ static struct conf_server *parse_server(xmlNode *node) xmlChar *host = xmlGetProp(n, (xmlChar *) "host"); xmlChar *myurl = xmlGetProp(n, (xmlChar *) "myurl"); if (port) - r->proxy_port = atoi((const char *) port); + server->proxy_port = atoi((const char *) port); if (host) - r->proxy_host = nmem_strdup(nmem, (const char *) host); + server->proxy_host = nmem_strdup(nmem, (const char *) host); if (myurl) - r->myurl = nmem_strdup(nmem, (const char *) myurl); + server->myurl = nmem_strdup(nmem, (const char *) myurl); #ifdef GAGA else { @@ -403,38 +467,34 @@ static struct conf_server *parse_server(xmlNode *node) xmlFree(host); xmlFree(myurl); } - else if (!strcmp((const char *) n->name, "zproxy")) - { - xmlChar *port = 0; - xmlChar *host = 0; - - port = xmlGetProp(n, (xmlChar *) "port"); - host = xmlGetProp(n, (xmlChar *) "host"); - - if (port) - r->zproxy_port = atoi((const char *) port); - if (host) - r->zproxy_host = nmem_strdup(nmem, (const char *) host); - - xmlFree(port); - xmlFree(host); - } else if (!strcmp((const char *) n->name, "settings")) { - if (r->settings) + if (server->settings) { yaz_log(YLOG_FATAL, "Can't repeat 'settings'"); return 0; } - if (!(r->settings = parse_settings(n))) + if (!(server->settings = parse_settings(n))) return 0; } + else if (!strcmp((const char *) n->name, "relevance")) + { + server->relevance_pct = pp2_charset_create_xml(n->children); + } + else if (!strcmp((const char *) n->name, "sort")) + { + server->sort_pct = pp2_charset_create_xml(n->children); + } + else if (!strcmp((const char *) n->name, "mergekey")) + { + server->mergekey_pct = pp2_charset_create_xml(n->children); + } else if (!strcmp((const char *) n->name, "service")) { struct conf_service *s = parse_service(n); if (!s) return 0; - r->service = s; + server->service = s; } else { @@ -442,13 +502,22 @@ static struct conf_server *parse_server(xmlNode *node) return 0; } } - return r; + if (!server->relevance_pct) + server->relevance_pct = pp2_charset_create(0); + if (!server->sort_pct) + server->sort_pct = pp2_charset_create(0); + if (!server->mergekey_pct) + server->mergekey_pct = pp2_charset_create(0); + return server; } xsltStylesheet *conf_load_stylesheet(const char *fname) { char path[256]; - sprintf(path, "%s/%s", confdir, fname); + if (*fname == '/') + yaz_snprintf(path, sizeof(path), fname); + else + yaz_snprintf(path, sizeof(path), "%s/%s", confdir, fname); return xsltParseStylesheetFile((xmlChar *) path); } @@ -547,6 +616,8 @@ int read_config(const char *fname) if ((p = strrchr(fname, '/'))) { int len = p - fname; + if (len >= sizeof(confdir)) + len = sizeof(confdir)-1; strncpy(confdir, fname, len); confdir[len] = '\0'; }