X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsettings.c;h=a1b15ebca9efd417ab43de10c4049e3cf9237aa7;hb=699a3fdd881c07a450e89a876caa23775ebbb930;hp=3455344d6e9bd19494768781e0b66fc3c35e2764;hpb=aeb802e28a6a6450e1bafd95efa828c0165411a4;p=pazpar2-moved-to-github.git diff --git a/src/settings.c b/src/settings.c index 3455344..a1b15eb 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 Index Data + Copyright (C) 2006-2012 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 @@ -59,7 +59,6 @@ static char *hard_settings[] = { "pz:id", "pz:name", "pz:queryencoding", - "pz:ip", "pz:zproxy", "pz:apdulog", "pz:sru", @@ -70,14 +69,15 @@ static char *hard_settings[] = { "pz:pqf_strftime", "pz:negotiation_charset", "pz:max_connections", - "pz:reuse_connections", /* PZ_REUSE_CONNECTION */ - "pz:termlist_term_factor", /* PZ_TERMLIST_TERM_FACTOR*/ - "pz:preferred", /* PZ_PREFERRED */ - "pz:extra_args", /* PZ_EXTRA_ARGS */ - "pz:query_syntax", /* PZ_QUERY_SYNTAX */ - "pz:option_recordfilter", /* PZ_OPTION_RECORDFILTER */ - "pz:facetmap:", /* PZ_FACETMAP */ - "pz:limitmap:", /* PZ_LIMITMAP */ + "pz:reuse_connections", + "pz:termlist_term_factor", + "pz:preferred", + "pz:extra_args", + "pz:query_syntax", + "pz:facetmap:", + "pz:limitmap:", + "pz:url", + "pz:sortmap:", 0 }; @@ -162,69 +162,53 @@ static int isdir(const char *path) } // Read settings from an XML file, calling handler function for each setting -void settings_read_node_x(xmlNode *n, - void *client_data, - void (*fun)(void *client_data, - struct setting *set)) +int settings_read_node_x(xmlNode *n, + void *client_data, + void (*fun)(void *client_data, + struct setting *set)) { - xmlChar *namea, *targeta, *valuea, *usera, *precedencea; + int ret_val = 0; /* success */ + char *namea = (char *) xmlGetProp(n, (xmlChar *) "name"); + char *targeta = (char *) xmlGetProp(n, (xmlChar *) "target"); + char *valuea = (char *) xmlGetProp(n, (xmlChar *) "value"); + char *usera = (char *) xmlGetProp(n, (xmlChar *) "user"); + char *precedencea = (char *) xmlGetProp(n, (xmlChar *) "precedence"); - namea = xmlGetProp(n, (xmlChar *) "name"); - targeta = xmlGetProp(n, (xmlChar *) "target"); - valuea = xmlGetProp(n, (xmlChar *) "value"); - usera = xmlGetProp(n, (xmlChar *) "user"); - precedencea = xmlGetProp(n, (xmlChar *) "precedence"); for (n = n->children; n; n = n->next) { if (n->type != XML_ELEMENT_NODE) continue; if (!strcmp((const char *) n->name, "set")) { - char *name, *target, *value, *user, *precedence; + struct setting set; + char *name = (char *) xmlGetProp(n, (xmlChar *) "name"); + char *target = (char *) xmlGetProp(n, (xmlChar *) "target"); + char *value = (char *) xmlGetProp(n, (xmlChar *) "value"); + char *user = (char *) xmlGetProp(n, (xmlChar *) "user"); + char *precedence = (char *) xmlGetProp(n, (xmlChar *) "precedence"); + + if (precedence) + set.precedence = atoi((char *) precedence); + else if (precedencea) + set.precedence = atoi((char *) precedencea); + else + set.precedence = 0; - name = (char *) xmlGetProp(n, (xmlChar *) "name"); - target = (char *) xmlGetProp(n, (xmlChar *) "target"); - value = (char *) xmlGetProp(n, (xmlChar *) "value"); - user = (char *) xmlGetProp(n, (xmlChar *) "user"); - precedence = (char *) xmlGetProp(n, (xmlChar *) "precedence"); + set.target = target ? target : targeta; + set.name = name ? name : namea; + set.value = value ? value : valuea; + set.next = 0; - if ((!name && !namea) || (!value && !valuea) || (!target && !targeta)) - { - yaz_log(YLOG_FATAL, "set must specify name, value, and target"); - exit(1); - } + if (set.name && set.value && set.target) + (*fun)(client_data, &set); else { - struct setting set; - char nameb[1024]; - char targetb[1024]; - char valueb[1024]; - - // Copy everything into a temporary buffer -- we decide - // later if we are keeping it. - if (precedence) - set.precedence = atoi((char *) precedence); - else if (precedencea) - set.precedence = atoi((char *) precedencea); - else - set.precedence = 0; - if (target) - strcpy(targetb, target); - else - strcpy(targetb, (const char *) targeta); - set.target = targetb; - if (name) - strcpy(nameb, name); - else - strcpy(nameb, (const char *) namea); - set.name = nameb; - if (value) - strcpy(valueb, value); + if (set.name) + yaz_log(YLOG_WARN, "missing value and/or target for " + "setting name=%s", set.name); else - strcpy(valueb, (const char *) valuea); - set.value = valueb; - set.next = 0; - (*fun)(client_data, &set); + yaz_log(YLOG_WARN, "missing name/value/target for setting"); + ret_val = -1; } xmlFree(name); xmlFree(precedence); @@ -234,8 +218,9 @@ void settings_read_node_x(xmlNode *n, } else { - yaz_log(YLOG_FATAL, "Unknown element %s in settings file", (char*) n->name); - exit(1); + yaz_log(YLOG_WARN, "Unknown element %s in settings file", + (char*) n->name); + ret_val = -1; } } xmlFree(namea); @@ -243,35 +228,39 @@ void settings_read_node_x(xmlNode *n, xmlFree(valuea); xmlFree(usera); xmlFree(targeta); + return ret_val; } -static void read_settings_file(const char *path, - void *client_data, - void (*fun)(void *client_data, - struct setting *set)) +static int read_settings_file(const char *path, + void *client_data, + void (*fun)(void *client_data, + struct setting *set)) { xmlDoc *doc = xmlParseFile(path); xmlNode *n; + int ret; if (!doc) { yaz_log(YLOG_FATAL, "Failed to parse %s", path); - exit(1); + return -1; } n = xmlDocGetRootElement(doc); - settings_read_node_x(n, client_data, fun); + ret = settings_read_node_x(n, client_data, fun); xmlFreeDoc(doc); + return ret; } // Recursively read files or directories, invoking a // callback for each one -static void read_settings(const char *path, +static int read_settings(const char *path, void *client_data, void (*fun)(void *client_data, struct setting *set)) { + int ret = 0; DIR *d; struct dirent *de; char *dot; @@ -281,7 +270,7 @@ static void read_settings(const char *path, if (!(d = opendir(path))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", path); - exit(1); + return -1; } while ((de = readdir(d))) { @@ -289,12 +278,14 @@ static void read_settings(const char *path, if (*de->d_name == '.' || !strcmp(de->d_name, "CVS")) continue; sprintf(tmp, "%s/%s", path, de->d_name); - read_settings(tmp, client_data, fun); + if (read_settings(tmp, client_data, fun)) + ret = -1; } closedir(d); } else if ((dot = strrchr(path, '.')) && !strcmp(dot + 1, "xml")) - read_settings_file(path, client_data, fun); + ret = read_settings_file(path, client_data, fun); + return ret; } // Determines if a ZURL is a wildcard, and what kind @@ -335,7 +326,7 @@ void expand_settings_array(struct setting ***set_ar, int *num, int offset, // This is called from grep_databases -- adds/overrides setting for a target // This is also where the rules for precedence of settings are implemented -static void update_database(void *context, struct database *db) +static void update_database_fun(void *context, struct database *db) { struct setting *set = ((struct update_database_context *) context)->set; @@ -345,7 +336,7 @@ static void update_database(void *context, struct database *db) int offset; // Is this the right database? - if (!match_zurl(db->url, set->target)) + if (!match_zurl(db->id, set->target)) return; offset = settings_create_offset(service, set->name); @@ -403,7 +394,7 @@ static void update_databases(void *client_data, struct setting *set) struct update_database_context context; context.set = set; context.service = service; - predef_grep_databases(&context, service, update_database); + predef_grep_databases(&context, service, update_database_fun); } // This simply copies the 'hard' (application-specific) settings @@ -437,22 +428,10 @@ static void initialize_soft_settings(struct conf_service *service) static void prepare_target_dictionary(void *client_data, struct setting *set) { struct conf_service *service = (struct conf_service *) client_data; - struct setting_dictionary *dictionary = service->dictionary; - - int i; - char *p; // If target address is not wildcard, add the database if (*set->target && !zurl_wildcard(set->target)) - find_database(set->target, service); - - // Determine if we already have a dictionary entry - if (!strncmp(set->name, "pz:", 3) && (p = strchr(set->name + 3, ':'))) - *(p + 1) = '\0'; - for (i = 0; i < dictionary->num; i++) - if (!strcmp(dictionary->dict[i], set->name)) - return; - yaz_log(YLOG_WARN, "Setting '%s' not configured as metadata", set->name); + create_database_for_service(set->target, service); } void init_settings(struct conf_service *service) @@ -468,22 +447,22 @@ void init_settings(struct conf_service *service) initialize_soft_settings(service); } -void settings_read_file(struct conf_service *service, const char *path, - int pass) +int settings_read_file(struct conf_service *service, const char *path, + int pass) { if (pass == 1) - read_settings(path, service, prepare_target_dictionary); + return read_settings(path, service, prepare_target_dictionary); else - read_settings(path, service, update_databases); + return read_settings(path, service, update_databases); } -void settings_read_node(struct conf_service *service, xmlNode *n, +int settings_read_node(struct conf_service *service, xmlNode *n, int pass) { if (pass == 1) - settings_read_node_x(n, service, prepare_target_dictionary); + return settings_read_node_x(n, service, prepare_target_dictionary); else - settings_read_node_x(n, service, update_databases); + return settings_read_node_x(n, service, update_databases); } /*