X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=ccc7722e71ed3be15901815c77263b4ac576eea7;hb=4371cb7e3302b0f42832327f5a94946ddceeb731;hp=9456f861650d66108f06f6cf6b689c2df7a56c47;hpb=4bf6000aed420a5787ae7ff3ea3c4f98dcb98ab7;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index 9456f86..ccc7722 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -114,9 +114,9 @@ static void conf_sortkey_assign(NMEM nmem, } -struct conf_service *conf_service_create(struct conf_config *config, +static struct conf_service *service_init(struct conf_config *config, int num_metadata, int num_sortkeys, - const char *service_id) + const char *service_id) { struct conf_service * service = 0; NMEM nmem = nmem_create(); @@ -129,6 +129,10 @@ struct conf_service *conf_service_create(struct conf_config *config, service->targetprofiles = 0; service->config = config; + service->relevance_pct = 0; + service->sort_pct = 0; + service->mergekey_pct = 0; + service->id = service_id ? nmem_strdup(nmem, service_id) : 0; service->num_metadata = num_metadata; service->metadata = 0; @@ -146,17 +150,18 @@ struct conf_service *conf_service_create(struct conf_config *config, return service; } -struct conf_metadata* conf_service_add_metadata(struct conf_service *service, - 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, - int sortkey_offset, - enum conf_metadata_mergekey mt) +static struct conf_metadata* conf_service_add_metadata( + struct conf_service *service, + 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, + int sortkey_offset, + enum conf_metadata_mergekey mt) { struct conf_metadata * md = 0; @@ -172,10 +177,11 @@ struct conf_metadata* conf_service_add_metadata(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) +static struct conf_sortkey * conf_service_add_sortkey( + struct conf_service *service, + int field_id, + const char *name, + enum conf_sortkey_type type) { struct conf_sortkey * sk = 0; @@ -246,10 +252,180 @@ static void service_destroy(struct conf_service *service) } } +static int parse_metadata(struct conf_service *service, xmlNode *n, + int *md_node, int *sk_node) +{ + xmlChar *xml_name = xmlGetProp(n, (xmlChar *) "name"); + xmlChar *xml_brief = xmlGetProp(n, (xmlChar *) "brief"); + xmlChar *xml_sortkey = xmlGetProp(n, (xmlChar *) "sortkey"); + xmlChar *xml_merge = xmlGetProp(n, (xmlChar *) "merge"); + 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"); + 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; + int sortkey_offset = 0; + + // now do the parsing logic + if (!xml_name) + { + yaz_log(YLOG_FATAL, "Must specify name in metadata element"); + return -1; + } + if (xml_brief) + { + if (!strcmp((const char *) xml_brief, "yes")) + brief = 1; + else if (strcmp((const char *) xml_brief, "no")) + { + yaz_log(YLOG_FATAL, "metadata/brief must be yes or no"); + return -1; + } + } + else + brief = 0; + + if (xml_termlist) + { + if (!strcmp((const char *) xml_termlist, "yes")) + termlist = 1; + else if (strcmp((const char *) xml_termlist, "no")) + { + yaz_log(YLOG_FATAL, "metadata/termlist must be yes or no"); + return -1; + } + } + else + termlist = 0; + + if (xml_rank) + rank = atoi((const char *) xml_rank); + else + rank = 0; + + if (xml_type) + { + if (!strcmp((const char *) xml_type, "generic")) + 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); + return -1; + } + } + else + type = Metadata_type_generic; + + if (xml_merge) + { + if (!strcmp((const char *) xml_merge, "no")) + merge = Metadata_merge_no; + else if (!strcmp((const char *) xml_merge, "unique")) + merge = Metadata_merge_unique; + else if (!strcmp((const char *) xml_merge, "longest")) + merge = Metadata_merge_longest; + else if (!strcmp((const char *) xml_merge, "range")) + merge = Metadata_merge_range; + else if (!strcmp((const char *) xml_merge, "all")) + merge = Metadata_merge_all; + else + { + yaz_log(YLOG_FATAL, + "Unknown value for metadata/merge: %s", xml_merge); + return -1; + } + } + 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 -1; + } + } + + // add a sortkey if so specified + if (xml_sortkey && strcmp((const char *) xml_sortkey, "no")) + { + if (merge == Metadata_merge_no) + { + yaz_log(YLOG_FATAL, + "Can't specify sortkey on a non-merged field"); + return -1; + } + if (!strcmp((const char *) xml_sortkey, "numeric")) + sk_type = Metadata_sortkey_numeric; + else if (!strcmp((const char *) xml_sortkey, "skiparticle")) + sk_type = Metadata_sortkey_skiparticle; + else + { + yaz_log(YLOG_FATAL, + "Unknown sortkey in metadata element: %s", + xml_sortkey); + return -1; + } + sortkey_offset = *sk_node; + + conf_service_add_sortkey(service, *sk_node, + (const char *) xml_name, sk_type); + + (*sk_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(service, *md_node, + (const char *) xml_name, + type, merge, setting, + brief, termlist, rank, sortkey_offset, + mergekey_type); + + xmlFree(xml_name); + xmlFree(xml_brief); + xmlFree(xml_sortkey); + xmlFree(xml_merge); + xmlFree(xml_type); + xmlFree(xml_termlist); + xmlFree(xml_rank); + xmlFree(xml_setting); + (*md_node)++; + return 0; +} + static struct conf_service *service_create(struct conf_config *config, xmlNode *node, - const char *service_id, - const char *server_settings) + const char *service_id) { xmlNode *n; int md_node = 0; @@ -272,8 +448,7 @@ static struct conf_service *service_create(struct conf_config *config, xmlFree(sortkey); } - service = conf_service_create(config, - num_metadata, num_sortkeys, service_id); + service = service_init(config, num_metadata, num_sortkeys, service_id); for (n = node->children; n; n = n->next) { @@ -292,173 +467,52 @@ static struct conf_service *service_create(struct conf_config *config, parse_targetprofiles(service->nmem, n))) return 0; } - else if (!strcmp((const char *) n->name, (const char *) "metadata")) + else if (!strcmp((const char *) n->name, "relevance")) { - xmlChar *xml_name = xmlGetProp(n, (xmlChar *) "name"); - xmlChar *xml_brief = xmlGetProp(n, (xmlChar *) "brief"); - xmlChar *xml_sortkey = xmlGetProp(n, (xmlChar *) "sortkey"); - xmlChar *xml_merge = xmlGetProp(n, (xmlChar *) "merge"); - 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"); - 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; - int sortkey_offset = 0; - - // now do the parsing logic - if (!xml_name) + if (service->relevance_pct) { - yaz_log(YLOG_FATAL, "Must specify name in metadata element"); + yaz_log(YLOG_LOG, "relevance may not repeat in service"); return 0; } - if (xml_brief) - { - if (!strcmp((const char *) xml_brief, "yes")) - brief = 1; - else if (strcmp((const char *) xml_brief, "no")) - { - yaz_log(YLOG_FATAL, "metadata/brief must be yes or no"); - return 0; - } - } else - brief = 0; - - if (xml_termlist) { - if (!strcmp((const char *) xml_termlist, "yes")) - termlist = 1; - else if (strcmp((const char *) xml_termlist, "no")) - { - yaz_log(YLOG_FATAL, "metadata/termlist must be yes or no"); + service->relevance_pct = pp2_charset_create_xml(n); + if (!service->relevance_pct) return 0; - } } - else - termlist = 0; - - if (xml_rank) - rank = atoi((const char *) xml_rank); - else - rank = 0; - - if (xml_type) - { - if (!strcmp((const char *) xml_type, "generic")) - 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); - return 0; - } - } - else - type = Metadata_type_generic; - - if (xml_merge) + } + else if (!strcmp((const char *) n->name, "sort")) + { + if (service->sort_pct) { - if (!strcmp((const char *) xml_merge, "no")) - merge = Metadata_merge_no; - else if (!strcmp((const char *) xml_merge, "unique")) - merge = Metadata_merge_unique; - else if (!strcmp((const char *) xml_merge, "longest")) - merge = Metadata_merge_longest; - else if (!strcmp((const char *) xml_merge, "range")) - merge = Metadata_merge_range; - else if (!strcmp((const char *) xml_merge, "all")) - merge = Metadata_merge_all; - else - { - yaz_log(YLOG_FATAL, - "Unknown value for metadata/merge: %s", xml_merge); - return 0; - } + yaz_log(YLOG_LOG, "sort may not repeat in service"); + return 0; } 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); + service->sort_pct = pp2_charset_create_xml(n); + if (!service->sort_pct) return 0; - } } - - // add a sortkey if so specified - if (xml_sortkey && strcmp((const char *) xml_sortkey, "no")) + } + else if (!strcmp((const char *) n->name, "mergekey")) + { + if (service->mergekey_pct) { - if (merge == Metadata_merge_no) - { - yaz_log(YLOG_FATAL, - "Can't specify sortkey on a non-merged field"); - return 0; - } - if (!strcmp((const char *) xml_sortkey, "numeric")) - sk_type = Metadata_sortkey_numeric; - else if (!strcmp((const char *) xml_sortkey, "skiparticle")) - sk_type = Metadata_sortkey_skiparticle; - else - { - yaz_log(YLOG_FATAL, - "Unknown sortkey in metadata element: %s", - xml_sortkey); - return 0; - } - sortkey_offset = sk_node; - - conf_service_add_sortkey(service, sk_node, - (const char *) xml_name, sk_type); - - sk_node++; + yaz_log(YLOG_LOG, "mergekey may not repeat in service"); + return 0; } else - sortkey_offset = -1; - - if (xml_mergekey && strcmp((const char *) xml_mergekey, "no")) { - mergekey_type = Metadata_mergekey_yes; + service->mergekey_pct = pp2_charset_create_xml(n); + if (!service->mergekey_pct) + return 0; } - - - // metadata known, assign values - conf_service_add_metadata(service, md_node, - (const char *) xml_name, - type, merge, setting, - brief, termlist, rank, sortkey_offset, - mergekey_type); - - xmlFree(xml_name); - xmlFree(xml_brief); - xmlFree(xml_sortkey); - xmlFree(xml_merge); - xmlFree(xml_type); - xmlFree(xml_termlist); - xmlFree(xml_rank); - xmlFree(xml_setting); - md_node++; + } + else if (!strcmp((const char *) n->name, (const char *) "metadata")) + { + if (parse_metadata(service, n, &md_node, &sk_node)) + return 0; } else { @@ -466,11 +520,11 @@ static struct conf_service *service_create(struct conf_config *config, return 0; } } - init_settings(service); if (got_settings) { int pass; /* metadata has been read.. Consider now settings */ + init_settings(service); for (pass = 1; pass <= 2; pass++) { for (n = node->children; n; n = n->next) @@ -496,14 +550,6 @@ static struct conf_service *service_create(struct conf_config *config, } } } - else - { - if (server_settings) - { - settings_read_file(service, server_settings, 1); - settings_read_file(service, server_settings, 2); - } - } return service; } @@ -529,11 +575,69 @@ static char *parse_settings(struct conf_config *config, return r; } -static struct conf_server *parse_server(struct conf_config *config, - NMEM nmem, xmlNode *node) +static void inherit_server_settings(struct conf_server *server) +{ + struct conf_service *s; + for (s = server->service; s; s = s->next) + { + if (!s->dictionary) /* service has no config settings ? */ + { + if (server->server_settings) + { + /* inherit settings from server */ + init_settings(s); + settings_read_file(s, server->server_settings, 1); + settings_read_file(s, server->server_settings, 2); + } + else + { + yaz_log(YLOG_WARN, "service '%s' has no settings", + s->id ? s->id : "unnamed"); + init_settings(s); + } + } + + /* use relevance/sort/mergekey from server if not defined + for this service.. */ + if (!s->relevance_pct) + { + if (server->relevance_pct) + { + s->relevance_pct = server->relevance_pct; + pp2_charset_incref(s->relevance_pct); + } + else + s->relevance_pct = pp2_charset_create(0); + } + + if (!s->sort_pct) + { + if (server->sort_pct) + { + s->sort_pct = server->sort_pct; + pp2_charset_incref(s->sort_pct); + } + else + s->sort_pct = pp2_charset_create(0); + } + + if (!s->mergekey_pct) + { + if (server->mergekey_pct) + { + s->mergekey_pct = server->mergekey_pct; + pp2_charset_incref(s->mergekey_pct); + } + else + s->mergekey_pct = pp2_charset_create(0); + } + } +} + +static struct conf_server *server_create(struct conf_config *config, + NMEM nmem, xmlNode *node) { xmlNode *n; - const char *server_settings = 0; struct conf_server *server = nmem_malloc(nmem, sizeof(struct conf_server)); server->host = 0; @@ -547,6 +651,7 @@ static struct conf_server *parse_server(struct conf_config *config, server->relevance_pct = 0; server->sort_pct = 0; server->mergekey_pct = 0; + server->server_settings = 0; for (n = node->children; n; n = n->next) { @@ -580,12 +685,12 @@ static struct conf_server *parse_server(struct conf_config *config, } else if (!strcmp((const char *) n->name, "settings")) { - if (server_settings) + if (server->server_settings) { yaz_log(YLOG_FATAL, "Can't repeat 'settings'"); return 0; } - if (!(server_settings = parse_settings(config, nmem, n))) + if (!(server->server_settings = parse_settings(config, nmem, n))) return 0; } else if (!strcmp((const char *) n->name, "relevance")) @@ -621,46 +726,25 @@ static struct conf_server *parse_server(struct conf_config *config, } else if (!(*sp)->id && !service_id) { - yaz_log(YLOG_FATAL, "Duplicate unnamed service"); + yaz_log(YLOG_FATAL, "Duplicate unnamed service '%s'", + service_id); break; } if (*sp) /* service already exist */ + { + xmlFree(service_id); return 0; + } else { struct conf_service *s = service_create(config, n, - service_id, - server_settings); - if (s) - { - if (server->relevance_pct) - { - s->relevance_pct = server->relevance_pct; - pp2_charset_incref(s->relevance_pct); - } - else - s->relevance_pct = pp2_charset_create(0); - - if (server->sort_pct) - { - s->sort_pct = server->sort_pct; - pp2_charset_incref(s->sort_pct); - } - else - s->sort_pct = pp2_charset_create(0); - - if (server->mergekey_pct) - { - s->mergekey_pct = server->mergekey_pct; - pp2_charset_incref(s->mergekey_pct); - } - else - s->mergekey_pct = pp2_charset_create(0); - *sp = s; - } + service_id); + xmlFree(service_id); + if (!s) + return 0; + *sp = s; } - xmlFree(service_id); } else { @@ -668,6 +752,7 @@ static struct conf_server *parse_server(struct conf_config *config, return 0; } } + inherit_server_settings(server); return server; } @@ -743,7 +828,7 @@ static int parse_config(struct conf_config *config, xmlNode *root) continue; if (!strcmp((const char *) n->name, "server")) { - struct conf_server *tmp = parse_server(config, config->nmem, n); + struct conf_server *tmp = server_create(config, config->nmem, n); if (!tmp) return -1; tmp->next = config->servers;