X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=f0e395fe2bad442ba4bf470b854be016ceaf3693;hb=f5a409a2a277b2579b7bc270f688b505f4d5564c;hp=ab4382b6b3d1b8a4d6fa97bf565f196c58fd74c7;hpb=7f725d287c1f048367de28c121b02132c3fbfca7;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index ab4382b..f0e395f 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -72,7 +72,7 @@ static void conf_metadata_assign(NMEM nmem, enum conf_setting_type setting, int brief, int termlist, - int rank, + const char *rank, int sortkey_offset, enum conf_metadata_mergekey mt, const char *facetrule, @@ -93,7 +93,7 @@ static void conf_metadata_assign(NMEM nmem, metadata->setting = setting; metadata->brief = brief; metadata->termlist = termlist; - metadata->rank = rank; + metadata->rank = nmem_strdup_null(nmem, rank); metadata->sortkey_offset = sortkey_offset; metadata->mergekey = mt; metadata->facetrule = nmem_strdup_null(nmem, facetrule); @@ -127,6 +127,7 @@ struct conf_service *service_init(struct conf_server *server, service->next = 0; service->databases = 0; service->xslt_list = 0; + service->ccl_bibset = 0; service->server = server; service->session_timeout = 60; /* default session timeout */ service->z3950_session_timeout = 180; @@ -138,7 +139,7 @@ struct conf_service *service_init(struct conf_server *server, // Setup a dictionary from server. service->dictionary = 0; - service->settings = nmem_malloc(nmem, sizeof(struct settings)); + service->settings = nmem_malloc(nmem, sizeof(*service->settings)); service->settings->num_settings = PZ_MAX_EOF; service->settings->settings = nmem_malloc(nmem, sizeof(struct setting*) * service->settings->num_settings); memset(service->settings->settings, 0, sizeof(struct setting*) * service->settings->num_settings); @@ -173,7 +174,7 @@ static struct conf_metadata* conf_service_add_metadata( enum conf_setting_type setting, int brief, int termlist, - int rank, + const char *rank, int sortkey_offset, enum conf_metadata_mergekey mt, const char *facetrule, @@ -259,6 +260,7 @@ void service_destroy(struct conf_service *service) { service_xslt_destroy(service); pp2_charset_fact_destroy(service->charsets); + ccl_qual_rm(&service->ccl_bibset); yaz_mutex_destroy(&service->mutex); nmem_destroy(service->nmem); } @@ -281,7 +283,6 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, enum conf_metadata_mergekey mergekey_type = Metadata_mergekey_no; int brief = 0; int termlist = 0; - int rank = 0; int sortkey_offset = 0; xmlChar *xml_name = 0; xmlChar *xml_brief = 0; @@ -294,6 +295,7 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, xmlChar *xml_mergekey = 0; xmlChar *xml_limitmap = 0; xmlChar *xml_icu_chain = 0; + struct _xmlAttr *attr; for (attr = n->properties; attr; attr = attr->next) { @@ -365,9 +367,6 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, } } - if (xml_rank) - rank = atoi((const char *) xml_rank); - if (xml_type) { if (!strcmp((const char *) xml_type, "generic")) @@ -469,8 +468,11 @@ static int parse_metadata(struct conf_service *service, xmlNode *n, conf_service_add_metadata(service, *md_node, (const char *) xml_name, type, merge, setting, - brief, termlist, rank, sortkey_offset, - mergekey_type, (const char *) xml_icu_chain, (const char *) xml_limitmap); + brief, termlist, + (const char *) xml_rank, sortkey_offset, + mergekey_type, + (const char *) xml_icu_chain, + (const char *) xml_limitmap); (*md_node)++; return 0; } @@ -542,6 +544,29 @@ static struct conf_service *service_create_static(struct conf_server *server, } } } + else if (!strcmp((const char *) n->name, "ccldirective")) + { + char *name; + char *value; + if (!service->ccl_bibset) + service->ccl_bibset = ccl_qual_mk(); + name = (char *) xmlGetProp(n, (xmlChar *) "name"); + if (!name) + { + yaz_log(YLOG_FATAL, "ccldirective: missing @name"); + return 0; + } + value = (char *) xmlGetProp(n, (xmlChar *) "value"); + if (!value) + { + xmlFree(name); + yaz_log(YLOG_FATAL, "ccldirective: missing @value"); + return 0; + } + ccl_qual_add_special(service->ccl_bibset, name, value); + xmlFree(value); + xmlFree(name); + } else if (!strcmp((const char *) n->name, "settings")) got_settings++; else if (!strcmp((const char *) n->name, "icu_chain")) @@ -607,19 +632,22 @@ static struct conf_service *service_create_static(struct conf_server *server, continue; if (!strcmp((const char *) n->name, "settings")) { + int ret; xmlChar *src = xmlGetProp(n, (xmlChar *) "src"); if (src) { WRBUF w = wrbuf_alloc(); conf_dir_path(server->config, w, (const char *) src); - settings_read_file(service, wrbuf_cstr(w), pass); + ret = settings_read_file(service, wrbuf_cstr(w), pass); wrbuf_destroy(w); xmlFree(src); } else { - settings_read_node(service, n, pass); + ret = settings_read_node(service, n, pass); } + if (ret) + return 0; } } } @@ -627,8 +655,9 @@ static struct conf_service *service_create_static(struct conf_server *server, return service; } -static void inherit_server_settings(struct conf_service *s) +static int inherit_server_settings(struct conf_service *s) { + int ret = 0; struct conf_server *server = s->server; if (!s->dictionary) /* service has no config settings ? */ { @@ -636,8 +665,10 @@ static void inherit_server_settings(struct conf_service *s) { /* inherit settings from server */ init_settings(s); - settings_read_file(s, server->settings_fname, 1); - settings_read_file(s, server->settings_fname, 2); + if (settings_read_file(s, server->settings_fname, 1)) + ret = -1; + if (settings_read_file(s, server->settings_fname, 2)) + ret = -1; } else { @@ -660,6 +691,7 @@ static void inherit_server_settings(struct conf_service *s) s->charsets = pp2_charset_fact_create(); } } + return ret; } struct conf_service *service_create(struct conf_server *server,