X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=bea5da7bd1ed6ff5dc55e04ac35b7298b9e9f042;hb=67ebd94d4bd94b8ade005dfa371638e0855f84d1;hp=b70a4cc83ab93e4c25d337ad4a938d85aaedd978;hpb=ed886db22397360898fa5ef764543237e99b1774;p=pazpar2-moved-to-github.git diff --git a/src/settings.c b/src/settings.c index b70a4cc..bea5da7 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1,7 +1,5 @@ -/* $Id: settings.c,v 1.25 2007-07-03 11:21:48 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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 @@ -14,21 +12,25 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ // This module implements a generic system of settings // (attribute-value) that can be associated with search targets. The // system supports both default values, per-target overrides, and // per-user settings. +#if HAVE_CONFIG_H +#include +#endif + + #include #include #include -#include +#include "direntz.h" #include #include @@ -73,6 +75,11 @@ struct setting_dictionary static struct setting_dictionary *dictionary = 0; +// This establishes the precedence of wildcard expressions +#define SETTING_WILDCARD_NO 0 // No wildcard +#define SETTING_WILDCARD_DB 1 // Database wildcard 'host:port/*' +#define SETTING_WILDCARD_YES 2 // Complete wildcard '*' + // Returns size of settings directory int settings_num(void) { @@ -242,10 +249,23 @@ static void read_settings(const char *path, } closedir(d); } - else if ((dot = rindex(path, '.')) && !strcmp(dot + 1, "xml")) + else if ((dot = strrchr(path, '.')) && !strcmp(dot + 1, "xml")) read_settings_file(path, fun); } +// Determines if a ZURL is a wildcard, and what kind +static int zurl_wildcard(const char *zurl) +{ + if (!zurl) + return SETTING_WILDCARD_NO; + if (*zurl == '*') + return SETTING_WILDCARD_YES; + else if (*(zurl + strlen(zurl) - 1) == '*') + return SETTING_WILDCARD_DB; + else + 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 @@ -255,7 +275,7 @@ static void prepare_dictionary(struct setting *set) char *p; // If target address is not wildcard, add the database - if (*set->target && set->target[strlen(set->target) - 1] != '*') + if (*set->target && !zurl_wildcard(set->target)) find_database(set->target, 0); // Determine if we already have a dictionary entry @@ -297,22 +317,6 @@ static void update_database(void *context, struct database *db) if (!match_zurl(db->url, set->target)) return; -#ifdef GAGA - // Initialize settings array if it doesn't exist. - // If so, also set the 'id' automatic setting - if (!db->settings) - { - struct setting *id = nmem_malloc(nmem, sizeof(struct setting)); - - db->settings = nmem_malloc(nmem, sizeof(struct settings*) * dictionary->num); - memset(db->settings, 0, sizeof(struct settings*) * dictionary->num); - id->precedence = 0; - id->name = "pz:id"; - id->target = id->value = db->url; - id->next = 0; - db->settings[PZ_ID] = id; - } -#endif if ((offset = settings_offset_cprefix(set->name)) < 0) abort(); // Should never get here @@ -324,15 +328,15 @@ static void update_database(void *context, struct database *db) { if (s->precedence < set->precedence) // We discard the value (nmem keeps track of the space) - *sp = (*sp)->next; + *sp = (*sp)->next; // unlink value from existing setting else if (s->precedence > set->precedence) - // Db contains a higher-priority setting. Abort + // Db contains a higher-priority setting. Abort search break; - if (*s->target == '*' && *set->target != '*') + if (zurl_wildcard(s->target) > zurl_wildcard(set->target)) // target-specific value trumps wildcard. Delete. - *sp = (*sp)->next; - else if (*s->target != '*' && *set->target == '*') - // Db already contains higher-priority setting. Abort + *sp = (*sp)->next; // unlink..... + else if (!zurl_wildcard(s->target)) + // Db already contains higher-priority setting. Abort search break; } if (!s) // s will be null when there are no higher-priority settings -- we add one @@ -366,6 +370,30 @@ static void initialize_hard_settings(struct setting_dictionary *dict) dict->num = dict->size; } +// Read any settings names introduced in service definition (config) and add to dictionary +// This is done now to avoid errors if user settings are declared in session overrides +static void initialize_soft_settings() +{ + struct conf_service *service = config->servers->service; + int i; + + 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(&set); + } +} + // If we ever decide we need to be able to specify multiple settings directories, // the two calls to read_settings must be split -- so the dictionary is prepared // for the contents of every directory before the databases are updated. @@ -386,6 +414,7 @@ void init_settings(void) memset(new, 0, sizeof(*new)); initialize_hard_settings(new); dictionary = new; + initialize_soft_settings(); } /*