X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=e796e00f4be66a68341a846fbb77dfa9d469fbcc;hb=a4d692f24164e5e8271599c2fcfd9cc5acc25c4b;hp=b209f78e272fb506296e2fd19db956e9f58f9401;hpb=9267d02c3601122f74bdf3a9d21f30080a4a1a9a;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index b209f78..e796e00 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -32,17 +32,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #define CONFIG_NOEXTERNS #include "pazpar2_config.h" -static NMEM nmem = 0; static char confdir[256] = "."; struct conf_config *config = 0; +static struct conf_metadata * conf_metadata_assign(NMEM nmem, struct conf_metadata * metadata, const char *name, @@ -52,7 +53,8 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem, int brief, int termlist, int rank, - int sortkey_offset) + int sortkey_offset, + enum conf_metadata_mergekey mt) { if (!nmem || !metadata || !name) return 0; @@ -72,10 +74,12 @@ struct conf_metadata * conf_metadata_assign(NMEM nmem, metadata->termlist = termlist; metadata->rank = rank; metadata->sortkey_offset = sortkey_offset; + metadata->mergekey = mt; return metadata; } +static struct conf_sortkey * conf_sortkey_assign(NMEM nmem, struct conf_sortkey * sortkey, const char *name, @@ -91,15 +95,19 @@ struct conf_sortkey * conf_sortkey_assign(NMEM nmem, } -struct conf_service * conf_service_create(NMEM nmem, - int num_metadata, int num_sortkeys) +struct conf_service * conf_service_create(int num_metadata, int num_sortkeys, + const char *service_id) { struct conf_service * service = 0; + NMEM nmem = nmem_create(); //assert(nmem); service = nmem_malloc(nmem, sizeof(struct conf_service)); + service->nmem = nmem; + service->next = 0; + service->id = service_id ? nmem_strdup(nmem, service_id) : 0; service->num_metadata = num_metadata; service->metadata = 0; if (service->num_metadata) @@ -112,12 +120,11 @@ struct conf_service * conf_service_create(NMEM nmem, service->sortkeys = nmem_malloc(nmem, sizeof(struct conf_sortkey) * service->num_sortkeys); - + service->dictionary = 0; return service; } -struct conf_metadata* conf_service_add_metadata(NMEM nmem, - struct conf_service *service, +struct conf_metadata* conf_service_add_metadata(struct conf_service *service, int field_id, const char *name, enum conf_metadata_type type, @@ -126,7 +133,8 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem, int brief, int termlist, int rank, - int sortkey_offset) + int sortkey_offset, + enum conf_metadata_mergekey mt) { struct conf_metadata * md = 0; @@ -136,14 +144,14 @@ struct conf_metadata* conf_service_add_metadata(NMEM nmem, //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); + md = conf_metadata_assign(service->nmem, md, name, type, merge, setting, + brief, termlist, rank, sortkey_offset, + mt); return md; } -struct conf_sortkey * conf_service_add_sortkey(NMEM nmem, - struct conf_service *service, +struct conf_sortkey * conf_service_add_sortkey(struct conf_service *service, int field_id, const char *name, enum conf_sortkey_type type) @@ -156,7 +164,7 @@ struct conf_sortkey * conf_service_add_sortkey(NMEM nmem, //sk = &((service->sortkeys)[field_id]); sk = service->sortkeys + field_id; - sk = conf_sortkey_assign(nmem, sk, name, type); + sk = conf_sortkey_assign(service->nmem, sk, name, type); return sk; } @@ -200,7 +208,7 @@ int conf_service_sortkey_field_id(struct conf_service *service, /* Code to parse configuration file */ /* ==================================================== */ -static struct conf_service *parse_service(xmlNode *node) +static struct conf_service *parse_service(xmlNode *node, const char *service_id) { xmlNode *n; int md_node = 0; @@ -222,7 +230,7 @@ static struct conf_service *parse_service(xmlNode *node) xmlFree(sortkey); } - service = conf_service_create(nmem, num_metadata, num_sortkeys); + service = conf_service_create(num_metadata, num_sortkeys, service_id); for (n = node->children; n; n = n->next) { @@ -238,11 +246,13 @@ static struct conf_service *parse_service(xmlNode *node) xmlChar *xml_termlist = xmlGetProp(n, (xmlChar *) "termlist"); xmlChar *xml_rank = xmlGetProp(n, (xmlChar *) "rank"); xmlChar *xml_setting = xmlGetProp(n, (xmlChar *) "setting"); + xmlChar *xml_mergekey = xmlGetProp(n, (xmlChar *) "mergekey"); 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; int rank = 0; @@ -363,7 +373,8 @@ static struct conf_service *parse_service(xmlNode *node) } sortkey_offset = sk_node; - conf_service_add_sortkey(nmem, service, sk_node, + conf_service_add_sortkey( +service, sk_node, (const char *) xml_name, sk_type); sk_node++; @@ -371,11 +382,18 @@ static struct conf_service *parse_service(xmlNode *node) else sortkey_offset = -1; + if (xml_mergekey && strcmp((const char *) xml_mergekey, "no")) + { + mergekey_type = Metadata_mergekey_yes; + } + + // metadata known, assign values - conf_service_add_metadata(nmem, service, md_node, + conf_service_add_metadata(service, md_node, (const char *) xml_name, type, merge, setting, - brief, termlist, rank, sortkey_offset); + brief, termlist, rank, sortkey_offset, + mergekey_type); xmlFree(xml_name); xmlFree(xml_brief); @@ -396,13 +414,22 @@ static struct conf_service *parse_service(xmlNode *node) return service; } -static char *parse_settings(xmlNode *node) +static char *parse_settings(NMEM nmem, xmlNode *node) { xmlChar *src = xmlGetProp(node, (xmlChar *) "src"); char *r; if (src) - r = nmem_strdup(nmem, (const char *) src); + { + if (yaz_is_abspath((const char *) src)) + r = nmem_strdup(nmem, (const char *) src); + else + { + r = nmem_malloc(nmem, + strlen(confdir) + strlen((const char *) src) + 2); + sprintf(r, "%s/%s", confdir, src); + } + } else { yaz_log(YLOG_FATAL, "Must specify src in targetprofile"); @@ -412,7 +439,7 @@ static char *parse_settings(xmlNode *node) return r; } -static struct conf_server *parse_server(xmlNode *node) +static struct conf_server *parse_server(NMEM nmem, xmlNode *node) { xmlNode *n; struct conf_server *server = nmem_malloc(nmem, sizeof(struct conf_server)); @@ -466,7 +493,7 @@ static struct conf_server *parse_server(xmlNode *node) yaz_log(YLOG_FATAL, "Can't repeat 'settings'"); return 0; } - if (!(server->settings = parse_settings(n))) + if (!(server->settings = parse_settings(nmem, n))) return 0; } else if (!strcmp((const char *) n->name, "relevance")) @@ -489,10 +516,31 @@ static struct conf_server *parse_server(xmlNode *node) } else if (!strcmp((const char *) n->name, "service")) { - struct conf_service *s = parse_service(n); - if (!s) + const char *service_id = (const char *) + xmlGetProp(n, (xmlChar *) "id"); + + struct conf_service **sp = &server->service; + for (; *sp; sp = &(*sp)->next) + if ((*sp)->id && service_id && + 0 == strcmp((*sp)->id, service_id)) + { + yaz_log(YLOG_FATAL, "Duplicate service: %s", service_id); + break; + } + else if (!(*sp)->id && !service_id) + { + yaz_log(YLOG_FATAL, "Duplicate unnamed service"); + break; + } + + if (*sp) /* service already exist */ return 0; - server->service = s; + else + { + struct conf_service *s = parse_service(n, service_id); + if (s) + *sp = s; + } } else { @@ -512,14 +560,15 @@ static struct conf_server *parse_server(xmlNode *node) xsltStylesheet *conf_load_stylesheet(const char *fname) { char path[256]; - if (*fname == '/') + if (yaz_is_abspath(fname)) yaz_snprintf(path, sizeof(path), fname); else yaz_snprintf(path, sizeof(path), "%s/%s", confdir, fname); return xsltParseStylesheetFile((xmlChar *) path); } -static struct conf_targetprofiles *parse_targetprofiles(xmlNode *node) +static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem, + xmlNode *node) { struct conf_targetprofiles *r = nmem_malloc(nmem, sizeof(*r)); xmlChar *type = xmlGetProp(node, (xmlChar *) "type"); @@ -555,11 +604,25 @@ static struct conf_targetprofiles *parse_targetprofiles(xmlNode *node) return r; } +struct conf_service *locate_service(const char *service_id) +{ + struct conf_service *s = config->servers->service; + for (; s; s = s->next) + if (s->id && service_id && 0 == strcmp(s->id, service_id)) + return s; + else if (!s->id && !service_id) + return s; + return 0; +} + + static struct conf_config *parse_config(xmlNode *root) { + NMEM nmem = nmem_create(); xmlNode *n; struct conf_config *r = nmem_malloc(nmem, sizeof(struct conf_config)); + r->nmem = nmem; r->servers = 0; r->targetprofiles = 0; @@ -569,7 +632,7 @@ static struct conf_config *parse_config(xmlNode *root) continue; if (!strcmp((const char *) n->name, "server")) { - struct conf_server *tmp = parse_server(n); + struct conf_server *tmp = parse_server(nmem, n); if (!tmp) return 0; tmp->next = r->servers; @@ -583,7 +646,7 @@ static struct conf_config *parse_config(xmlNode *root) yaz_log(YLOG_FATAL, "Can't repeat targetprofiles"); return 0; } - if (!(r->targetprofiles = parse_targetprofiles(n))) + if (!(r->targetprofiles = parse_targetprofiles(nmem, n))) return 0; } else @@ -600,18 +663,20 @@ int read_config(const char *fname) xmlDoc *doc = xmlParseFile(fname); const char *p; - if (!nmem) // Initialize - { - nmem = nmem_create(); - xmlSubstituteEntitiesDefault(1); - xmlLoadExtDtdDefaultValue = 1; - } + xmlSubstituteEntitiesDefault(1); + xmlLoadExtDtdDefaultValue = 1; if (!doc) { yaz_log(YLOG_FATAL, "Failed to read %s", fname); exit(1); } - if ((p = strrchr(fname, '/'))) + if ((p = strrchr(fname, +#ifdef WIN32 + '\\' +#else + '/' +#endif + ))) { int len = p - fname; if (len >= sizeof(confdir))