-// $Id: settings.c,v 1.3 2007-03-29 13:44:19 quinn Exp $
+/* $Id: settings.c,v 1.12 2007-04-11 11:22:35 marc 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 <string.h>
#include <stdio.h>
static char *hard_settings[] = {
"pz:piggyback",
"pz:elements",
- "pz::syntax",
+ "pz:requestsyntax",
+ "pz:cclmap:",
+ "pz:encoding",
+ "pz:xslt",
+ "pz:nativesyntax",
+ "pz:authentication",
+ "pz:allow",
+ "pz:maxrecs",
+ "pz:id",
0
};
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;
+ if (!name)
+ name = "";
for (i = 0; i < dictionary->num; i++)
if (!strcmp(name, dictionary->dict[i]))
return i;
return -1;
}
+// 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)
+{
+ const char *p;
+ int maxlen = 100;
+ int i;
+
+ if (!strncmp("pz:", name, 3) && (p = strchr(name + 3, ':')))
+ maxlen = (p - name) + 1;
+ for (i = 0; i < dictionary->num; i++)
+ if (!strncmp(name, dictionary->dict[i], maxlen))
+ return i;
+ return -1;
+}
+
char *settings_name(int offset)
{
return dictionary->dict[offset];
{
if (n->type != XML_ELEMENT_NODE)
continue;
- if (!strcmp(n->name, (xmlChar *) "set"))
+ if (!strcmp((const char *) n->name, "set"))
{
char *name, *target, *value, *user, *precedence;
- name = xmlGetProp(n, (xmlChar *) "name");
- target = xmlGetProp(n, (xmlChar *) "target");
- value = xmlGetProp(n, (xmlChar *) "value");
- user = xmlGetProp(n, (xmlChar *) "user");
- precedence = xmlGetProp(n, (xmlChar *) "precedence");
+ 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");
if ((!name && !namea) || (!value && !valuea) || (!target && !targeta))
{
if (user)
strcpy(userb, user);
else if (usera)
- strcpy(userb, usera);
+ strcpy(userb, (const char *) usera);
else
set.user = "";
if (target)
strcpy(targetb, target);
else
- strcpy(targetb, targeta);
+ strcpy(targetb, (const char *) targeta);
set.target = targetb;
if (name)
strcpy(nameb, name);
else
- strcpy(nameb, namea);
+ strcpy(nameb, (const char *) namea);
set.name = nameb;
if (value)
strcpy(valueb, value);
else
- strcpy(valueb, valuea);
+ strcpy(valueb, (const char *) valuea);
set.value = valueb;
set.next = 0;
(*fun)(&set);
xmlFree(valuea);
xmlFree(usera);
xmlFree(targeta);
+
+ xmlFreeDoc(doc);
}
// Recursively read files in a directory structure, calling
static void prepare_dictionary(struct setting *set)
{
int i;
+ char *p;
+ 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 fle
+ {
+ yaz_log(YLOG_FATAL, "Unknown pz: setting '%s'", set->name);
+ exit(1);
+ }
// Create a new dictionary entry
// Grow dictionary if necessary
if (!dictionary->size)
struct setting *s, **sp;
int offset;
+ // Is this the right database?
+ if (!match_zurl(db->url, set->target))
+ return;
+
+ // 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, sizeof(struct settings*) * dictionary->num, 0);
+ memset(db->settings, 0, sizeof(struct settings*) * dictionary->num);
+ id->precedence = 0;
+ id->name = "pz:id";
+ id->target = id->value = db->url;
+ id->user = "";
+ id->next = 0;
+ db->settings[PZ_ID] = id;
}
- if ((offset = settings_offset(set->name)) < 0)
+ if ((offset = settings_offset_cprefix(set->name)) < 0)
abort(); // Should never get here
// 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->user, set->user))
+ if (!strcmp(s->user, set->user) && !strcmp(s->name, set->name))
{
if (s->precedence < set->precedence)
// We discard the value (nmem keeps track of the space)
{
struct setting *new = nmem_malloc(nmem, sizeof(*new));
- memset(new, sizeof(*new), 0);
+ memset(new, 0, sizeof(*new));
new->precedence = set->precedence;
new->target = nmem_strdup(nmem, set->target);
new->name = nmem_strdup(nmem, set->name);
// 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);
+ grep_databases(set, 0, update_database);
}
// This simply copies the 'hard' (application-specific) settings
else
nmem_reset(nmem);
new = nmem_malloc(nmem, sizeof(*new));
+ memset(new, 0, sizeof(*new));
initialize_hard_settings(new);
- memset(new, sizeof(*new), 0);
dictionary = new;
read_settings(path, prepare_dictionary);
read_settings(path, update_databases);
projects / pazpar2-moved-to-github.git / blobdiff