-/* $Id: settings.c,v 1.21 2007-05-16 17:16:21 quinn 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
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
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
-#include <dirent.h>
+#include "direntz.h"
#include <stdlib.h>
#include <sys/stat.h>
"pz:name",
"pz:queryencoding",
"pz:ip",
+ "pz:zproxy",
+ "pz:apdulog",
0
};
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)
{
}
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
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
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, 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;
- }
if ((offset = settings_offset_cprefix(set->name)) < 0)
abort(); // Should never get here
{
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
// This is used in pass 2 to assign name/value pairs to databases
static void update_databases(struct setting *set)
{
- grep_databases(set, 0, update_database);
+ predef_grep_databases(set, 0, update_database);
}
// This simply copies the 'hard' (application-specific) settings
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.
memset(new, 0, sizeof(*new));
initialize_hard_settings(new);
dictionary = new;
+ initialize_soft_settings();
}
/*
projects / pazpar2-moved-to-github.git / blobdiff