projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more records constructor work, no yet finished
[pazpar2-moved-to-github.git]
/
src
/
settings.c
diff --git
a/src/settings.c
b/src/settings.c
index
6212162
..
e6b7c3a
100644
(file)
--- a/
src/settings.c
+++ b/
src/settings.c
@@
-1,4
+1,4
@@
-/* $Id: settings.c,v 1.16 2007-04-13 01:48:22 quinn Exp $
+/* $Id: settings.c,v 1.19 2007-04-23 08:15:22 marc Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-50,7
+50,6
@@
static char *hard_settings[] = {
"pz:elements",
"pz:requestsyntax",
"pz:cclmap:",
"pz:elements",
"pz:requestsyntax",
"pz:cclmap:",
- "pz:encoding",
"pz:xslt",
"pz:nativesyntax",
"pz:authentication",
"pz:xslt",
"pz:nativesyntax",
"pz:authentication",
@@
-59,6
+58,7
@@
static char *hard_settings[] = {
"pz:id",
"pz:name",
"pz:queryencoding",
"pz:id",
"pz:name",
"pz:queryencoding",
+ "pz:ip",
0
};
0
};
@@
-264,10
+264,8
@@
static void prepare_dictionary(struct setting *set)
return;
if (!strncmp(set->name, "pz:", 3)) // Probably a typo in config fle
return;
if (!strncmp(set->name, "pz:", 3)) // Probably a typo in config fle
- {
yaz_log(YLOG_FATAL, "Unknown pz: setting '%s'", set->name);
yaz_log(YLOG_FATAL, "Unknown pz: setting '%s'", set->name);
- exit(1);
- }
+
// Create a new dictionary entry
// Grow dictionary if necessary
if (!dictionary->size)
// Create a new dictionary entry
// Grow dictionary if necessary
if (!dictionary->size)
@@
-366,6
+364,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)
{
// 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();
struct setting_dictionary *new;
if (!nmem)
nmem = nmem_create();
@@
-375,8
+379,6
@@
void settings_read(const char *path)
memset(new, 0, sizeof(*new));
initialize_hard_settings(new);
dictionary = new;
memset(new, 0, sizeof(*new));
initialize_hard_settings(new);
dictionary = new;
- read_settings(path, prepare_dictionary);
- read_settings(path, update_databases);
}
/*
}
/*