X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=2d99c78a7b851921862e2e01d07832f5fe3d0f28;hb=aa698bfd22b2ead2ee2c73b330806f7f7c161bfb;hp=155dac7d0102feef0dbc20a0ac37b03c8c41d60e;hpb=d54caf29766776a237d07c93e8f2bc76f5dc9c5e;p=pazpar2-moved-to-github.git diff --git a/src/settings.c b/src/settings.c index 155dac7..2d99c78 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2010 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 @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include -#include "direntz.h" +#include #include #include @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#include "pazpar2.h" +#include "session.h" #include "database.h" #include "settings.h" @@ -67,6 +67,8 @@ static char *hard_settings[] = { "pz:pqf_prefix", "pz:sort", "pz:recordfilter", + "pz:pqf_strftime", + "pz:negotiation_charset", 0 }; @@ -88,36 +90,53 @@ int settings_num(struct conf_service *service) return service->dictionary->num; } -int settings_offset(struct conf_service *service, const char *name) +static int settings_lookup(struct conf_service *service, const char *name, + int allow_create) { + size_t maxlen; int i; + const char *p; + struct setting_dictionary *dictionary = service->dictionary; + + assert(name); - if (!name) - name = ""; - for (i = 0; i < service->dictionary->num; i++) - if (!strcmp(name, service->dictionary->dict[i])) + if (!strncmp("pz:", name, 3) && (p = strchr(name + 3, ':'))) + maxlen = (p - name) + 1; + else + maxlen = strlen(name) + 1; + for (i = 0; i < dictionary->num; i++) + if (!strncmp(name, dictionary->dict[i], maxlen)) return i; - return -1; + if (!allow_create) + return -1; + if (!strncmp("pz:", name, 3)) + yaz_log(YLOG_WARN, "Adding pz-type setting name %s", name); + if (dictionary->num + 1 > dictionary->size) + { + char **tmp = + nmem_malloc(service->nmem, dictionary->size * 2 * sizeof(char*)); + memcpy(tmp, dictionary->dict, dictionary->size * sizeof(char*)); + dictionary->dict = tmp; + dictionary->size *= 2; + } + dictionary->dict[dictionary->num] = nmem_strdup(service->nmem, name); + dictionary->dict[dictionary->num][maxlen-1] = '\0'; + return dictionary->num++; } -// Ignores everything after second colon, if present -// A bit of a hack to support the pz:cclmap: scheme (and more to come?) -int settings_offset_cprefix(struct conf_service *service, const char *name) +int settings_create_offset(struct conf_service *service, const char *name) { - const char *p; - int maxlen = 100; - int i; + return settings_lookup(service, name, 1); +} - if (!strncmp("pz:", name, 3) && (p = strchr(name + 3, ':'))) - maxlen = (p - name) + 1; - for (i = 0; i < service->dictionary->num; i++) - if (!strncmp(name, service->dictionary->dict[i], maxlen)) - return i; - return -1; +int settings_lookup_offset(struct conf_service *service, const char *name) +{ + return settings_lookup(service, name, 0); } char *settings_name(struct conf_service *service, int offset) { + assert(offset < service->dictionary->num); return service->dictionary->dict[offset]; } @@ -282,52 +301,29 @@ static int zurl_wildcard(const char *zurl) return SETTING_WILDCARD_NO; } -// Callback. Adds a new entry to the dictionary if necessary -// This is used in pass 1 to determine layout of dictionary -// and to load any databases mentioned -static void prepare_dictionary(struct conf_service *service, - struct setting *set) -{ - struct setting_dictionary *dictionary = service->dictionary; - - int i; - char *p; - - // 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; - - if (!strncmp(set->name, "pz:", 3)) // Probably a typo in config file - { - yaz_log(YLOG_FATAL, "Unknown pz: setting '%s'", set->name); - exit(1); - } - - // Create a new dictionary entry - // Grow dictionary if necessary - if (!dictionary->size) - dictionary->dict = - nmem_malloc(service->nmem, (dictionary->size = 50) * sizeof(char*)); - else if (dictionary->num + 1 > dictionary->size) - { - char **tmp = - nmem_malloc(service->nmem, dictionary->size * 2 * sizeof(char*)); - memcpy(tmp, dictionary->dict, dictionary->size * sizeof(char*)); - dictionary->dict = tmp; - dictionary->size *= 2; - } - dictionary->dict[dictionary->num++] = nmem_strdup(service->nmem, set->name); -} - - struct update_database_context { struct setting *set; struct conf_service *service; }; +void expand_settings_array(struct setting ***set_ar, int *num, int offset, + NMEM nmem) +{ + assert(offset >= 0); + assert(*set_ar); + if (offset >= *num) + { + int i, n_num = offset + 10; + struct setting **n_ar = nmem_malloc(nmem, n_num * sizeof(*n_ar)); + for (i = 0; i < *num; i++) + n_ar[i] = (*set_ar)[i]; + for (; i < n_num; i++) + n_ar[i] = 0; + *num = n_num; + *set_ar = n_ar; + } +} + // 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) @@ -336,36 +332,47 @@ static void update_database(void *context, struct database *db) context)->set; struct conf_service *service = ((struct update_database_context *) context)->service; - struct setting *s, **sp; + struct setting **sp; int offset; // Is this the right database? if (!match_zurl(db->url, set->target)) return; - if ((offset = settings_offset_cprefix(service, set->name)) < 0) - return ; + offset = settings_create_offset(service, set->name); + expand_settings_array(&db->settings, &db->num_settings, offset, + service->nmem); // First we determine if this setting is overriding any existing settings // with the same name. - for (s = db->settings[offset], sp = &db->settings[offset]; s; - sp = &s->next, s = s->next) - if (!strcmp(s->name, set->name)) + assert(offset < db->num_settings); + for (sp = &db->settings[offset]; *sp; ) + if (!strcmp((*sp)->name, set->name)) { - if (s->precedence < set->precedence) + if ((*sp)->precedence < set->precedence) + { // We discard the value (nmem keeps track of the space) *sp = (*sp)->next; // unlink value from existing setting - else if (s->precedence > set->precedence) + } + else if ((*sp)->precedence > set->precedence) + { // Db contains a higher-priority setting. Abort search break; - if (zurl_wildcard(s->target) > zurl_wildcard(set->target)) + } + else if (zurl_wildcard((*sp)->target) > zurl_wildcard(set->target)) + { // target-specific value trumps wildcard. Delete. *sp = (*sp)->next; // unlink..... - else if (!zurl_wildcard(s->target)) + } + else if (zurl_wildcard((*sp)->target) < zurl_wildcard(set->target)) // Db already contains higher-priority setting. Abort search break; + else + sp = &(*sp)->next; } - if (!s) // s will be null when there are no higher-priority settings -- we add one + else + sp = &(*sp)->next; + if (!*sp) // is null when there are no higher-priority settings, so we add one { struct setting *new = nmem_malloc(service->nmem, sizeof(*new)); @@ -387,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, 0, update_database); + predef_grep_databases(&context, service, update_database); } // This simply copies the 'hard' (application-specific) settings @@ -409,18 +416,12 @@ static void initialize_soft_settings(struct conf_service *service) for (i = 0; i < service->num_metadata; i++) { - struct setting set; struct conf_metadata *md = &service->metadata[i]; if (md->setting == Metadata_setting_no) continue; - set.precedence = 0; - set.target = ""; - set.name = md->name; - set.value = ""; - set.next = 0; - prepare_dictionary(service, &set); + settings_create_offset(service, md->name); } } @@ -434,7 +435,7 @@ static void prepare_target_dictionary(void *client_data, struct setting *set) // If target address is not wildcard, add the database if (*set->target && !zurl_wildcard(set->target)) - find_database(set->target, 0, service); + find_database(set->target, service); // Determine if we already have a dictionary entry if (!strncmp(set->name, "pz:", 3) && (p = strchr(set->name + 3, ':')))