X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsettings.c;h=b70a4cc83ab93e4c25d337ad4a938d85aaedd978;hb=ed886db22397360898fa5ef764543237e99b1774;hp=54afa71be310cb7566ff6c6686eac45e3da22734;hpb=59f03637638041bd0e8540c0ab76991dc178bdbf;p=pazpar2-moved-to-github.git diff --git a/src/settings.c b/src/settings.c index 54afa71..b70a4cc 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1,7 +1,29 @@ -// $Id: settings.c,v 1.6 2007-04-03 03:55:12 quinn Exp $ -// 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. +/* $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. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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. + */ + + +// 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. #include #include @@ -26,10 +48,19 @@ static NMEM nmem = 0; static char *hard_settings[] = { "pz:piggyback", "pz:elements", - "pz:syntax", + "pz:requestsyntax", "pz:cclmap:", - "pz:charset", "pz:xslt", + "pz:nativesyntax", + "pz:authentication", + "pz:allow", + "pz:maxrecs", + "pz:id", + "pz:name", + "pz:queryencoding", + "pz:ip", + "pz:zproxy", + "pz:apdulog", 0 }; @@ -42,6 +73,12 @@ struct setting_dictionary static struct setting_dictionary *dictionary = 0; +// Returns size of settings directory +int settings_num(void) +{ + return dictionary->num; +} + int settings_offset(const char *name) { int i; @@ -56,7 +93,7 @@ int settings_offset(const char *name) // Ignores everything after second colon, if present // A bit of a hack to support the pz:cclmap: scheme (and more to come?) -static int settings_offset_cprefix(const char *name) +int settings_offset_cprefix(const char *name) { const char *p; int maxlen = 100; @@ -130,7 +167,6 @@ static void read_settings_file(const char *path, struct setting set; char nameb[1024]; char targetb[1024]; - char userb[1024]; char valueb[1024]; // Copy everything into a temporary buffer -- we decide @@ -141,13 +177,6 @@ static void read_settings_file(const char *path, set.precedence = atoi((char *) precedencea); else set.precedence = 0; - set.user = userb; - if (user) - strcpy(userb, user); - else if (usera) - strcpy(userb, (const char *) usera); - else - set.user = ""; if (target) strcpy(targetb, target); else @@ -183,51 +212,65 @@ static void read_settings_file(const char *path, xmlFree(valuea); xmlFree(usera); xmlFree(targeta); + + xmlFreeDoc(doc); } -// Recursively read files in a directory structure, calling +// Recursively read files or directories, invoking a // callback for each one static void read_settings(const char *path, void (*fun)(struct setting *set)) { DIR *d; struct dirent *de; + char *dot; - if (!(d = opendir(path))) + if (isdir(path)) { - yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", path); - exit(1); - } - while ((de = readdir(d))) - { - char tmp[1024]; - if (*de->d_name == '.' || !strcmp(de->d_name, "CVS")) - continue; - sprintf(tmp, "%s/%s", path, de->d_name); - if (isdir(tmp)) - read_settings(tmp, fun); - else + if (!(d = opendir(path))) { - char *dot; - if ((dot = rindex(de->d_name, '.')) && !strcmp(dot + 1, "xml")) - read_settings_file(tmp, fun); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", path); + exit(1); } + while ((de = readdir(d))) + { + char tmp[1024]; + if (*de->d_name == '.' || !strcmp(de->d_name, "CVS")) + continue; + sprintf(tmp, "%s/%s", path, de->d_name); + read_settings(tmp, fun); + } + closedir(d); } - closedir(d); + else if ((dot = rindex(path, '.')) && !strcmp(dot + 1, "xml")) + read_settings_file(path, fun); } // 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 setting *set) { int i; char *p; + // If target address is not wildcard, add the database + if (*set->target && set->target[strlen(set->target) - 1] != '*') + find_database(set->target, 0); + + // 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) @@ -250,11 +293,26 @@ static void update_database(void *context, struct database *db) struct setting *s, **sp; int offset; + // Is this the right database? + 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 @@ -262,7 +320,7 @@ static void update_database(void *context, struct database *db) // with the same name. for (s = db->settings[offset], sp = &db->settings[offset]; s; sp = &s->next, s = s->next) - if (!strcmp(s->user, set->user) && !strcmp(s->name, set->name)) + if (!strcmp(s->name, set->name)) { if (s->precedence < set->precedence) // We discard the value (nmem keeps track of the space) @@ -286,7 +344,6 @@ static void update_database(void *context, struct database *db) new->target = nmem_strdup(nmem, set->target); new->name = nmem_strdup(nmem, set->name); new->value = nmem_strdup(nmem, set->value); - new->user = nmem_strdup(nmem, set->user); new->next = db->settings[offset]; db->settings[offset] = new; } @@ -296,16 +353,7 @@ static void update_database(void *context, struct database *db) // This is used in pass 2 to assign name/value pairs to databases static void update_databases(struct setting *set) { - struct database_criterion crit; - struct database_criterion_value val; - - // Update all databases which match pattern in set->target - crit.name = "id"; - crit.values = &val; - crit.next = 0; - val.value = set->target; - val.next = 0; - grep_databases(set, &crit, update_database); + predef_grep_databases(set, 0, update_database); } // This simply copies the 'hard' (application-specific) settings @@ -323,6 +371,12 @@ static void initialize_hard_settings(struct setting_dictionary *dict) // for the contents of every directory before the databases are updated. void settings_read(const char *path) { + read_settings(path, prepare_dictionary); + read_settings(path, update_databases); +} + +void init_settings(void) +{ struct setting_dictionary *new; if (!nmem) nmem = nmem_create(); @@ -332,8 +386,6 @@ void settings_read(const char *path) memset(new, 0, sizeof(*new)); initialize_hard_settings(new); dictionary = new; - read_settings(path, prepare_dictionary); - read_settings(path, update_databases); } /*