-/* $Id: settings.c,v 1.15 2007-04-12 11:35:08 marc Exp $
+/* $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.
"pz:elements",
"pz:requestsyntax",
"pz:cclmap:",
- "pz:encoding",
"pz:xslt",
"pz:nativesyntax",
"pz:authentication",
"pz:id",
"pz:name",
"pz:queryencoding",
+ "pz:ip",
0
};
// 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;
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
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);
- }
+ 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)
// 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();
memset(new, 0, sizeof(*new));
initialize_hard_settings(new);
dictionary = new;
- read_settings(path, prepare_dictionary);
- read_settings(path, update_databases);
}
/*