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
Added new setting pz:apdulog which controls whether APDUs should be
[pazpar2-moved-to-github.git]
/
src
/
settings.c
diff --git
a/src/settings.c
b/src/settings.c
index
e0ef312
..
b70a4cc
100644
(file)
--- a/
src/settings.c
+++ b/
src/settings.c
@@
-1,4
+1,4
@@
-/* $Id: settings.c,v 1.21 2007-05-16 17:16:21 quinn Exp $
+/* $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.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-59,6
+59,8
@@
static char *hard_settings[] = {
"pz:name",
"pz:queryencoding",
"pz:ip",
"pz:name",
"pz:queryencoding",
"pz:ip",
+ "pz:zproxy",
+ "pz:apdulog",
0
};
0
};
@@
-295,6
+297,7
@@
static void update_database(void *context, struct database *db)
if (!match_zurl(db->url, set->target))
return;
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)
// Initialize settings array if it doesn't exist.
// If so, also set the 'id' automatic setting
if (!db->settings)
@@
-309,6
+312,7
@@
static void update_database(void *context, struct database *db)
id->next = 0;
db->settings[PZ_ID] = id;
}
id->next = 0;
db->settings[PZ_ID] = id;
}
+#endif
if ((offset = settings_offset_cprefix(set->name)) < 0)
abort(); // Should never get here
if ((offset = settings_offset_cprefix(set->name)) < 0)
abort(); // Should never get here
@@
-349,7
+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)
{
// 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
}
// This simply copies the 'hard' (application-specific) settings