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
ea84e06
..
b70a4cc
100644
(file)
--- a/
src/settings.c
+++ b/
src/settings.c
@@
-1,4
+1,4
@@
-/* $Id: settings.c,v 1.11 2007-04-11 02:14:15 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.
@@
-20,9
+20,10
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
*/
-// 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.
+// 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>
#include <string.h>
#include <stdio.h>
@@
-49,13
+50,17
@@
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:allow",
"pz:maxrecs",
"pz:id",
"pz:xslt",
"pz:nativesyntax",
"pz:authentication",
"pz:allow",
"pz:maxrecs",
"pz:id",
+ "pz:name",
+ "pz:queryencoding",
+ "pz:ip",
+ "pz:zproxy",
+ "pz:apdulog",
0
};
0
};
@@
-88,7
+93,7
@@
int settings_offset(const char *name)
// Ignores everything after second colon, if present
// A bit of a hack to support the pz:cclmap: scheme (and more to come?)
// 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;
{
const char *p;
int maxlen = 100;
@@
-162,7
+167,6
@@
static void read_settings_file(const char *path,
struct setting set;
char nameb[1024];
char targetb[1024];
struct setting set;
char nameb[1024];
char targetb[1024];
- char userb[1024];
char valueb[1024];
// Copy everything into a temporary buffer -- we decide
char valueb[1024];
// Copy everything into a temporary buffer -- we decide
@@
-173,13
+177,6
@@
static void read_settings_file(const char *path,
set.precedence = atoi((char *) precedencea);
else
set.precedence = 0;
set.precedence = atoi((char *) precedencea);
else
set.precedence = 0;
- set.user = userb;
- if (user)
- strcpy(userb, user);
- else if (usera)
- strcpy(userb, (const char *) usera);
- else
- set.user = "";
if (target)
strcpy(targetb, target);
else
if (target)
strcpy(targetb, target);
else
@@
-215,56
+212,65
@@
static void read_settings_file(const char *path,
xmlFree(valuea);
xmlFree(usera);
xmlFree(targeta);
xmlFree(valuea);
xmlFree(usera);
xmlFree(targeta);
+
+ 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;
// 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)))
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "%s", path);
- exit(1);
- }
- while ((de = readdir(d)))
+ if (isdir(path))
{
{
- 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
// This is used in pass 1 to determine layout of dictionary
}
// 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
static void prepare_dictionary(struct setting *set)
{
int i;
char *p;
static void prepare_dictionary(struct setting *set)
{
int i;
char *p;
+ // If target address is not wildcard, add the database
+ if (*set->target && set->target[strlen(set->target) - 1] != '*')
+ find_database(set->target, 0);
+
+ // Determine if we already have a dictionary entry
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) && (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);
- }
+
+ 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)
// Create a new dictionary entry
// Grow dictionary if necessary
if (!dictionary->size)
@@
-291,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)
@@
-302,10
+309,10
@@
static void update_database(void *context, struct database *db)
id->precedence = 0;
id->name = "pz:id";
id->target = id->value = db->url;
id->precedence = 0;
id->name = "pz:id";
id->target = id->value = db->url;
- id->user = "";
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
@@
-313,7
+320,7
@@
static void update_database(void *context, struct database *db)
// with the same name.
for (s = db->settings[offset], sp = &db->settings[offset]; s;
sp = &s->next, s = s->next)
// 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) && !strcmp(s->name, set->name))
+ if (!strcmp(s->name, set->name))
{
if (s->precedence < set->precedence)
// We discard the value (nmem keeps track of the space)
{
if (s->precedence < set->precedence)
// We discard the value (nmem keeps track of the space)
@@
-337,7
+344,6
@@
static void update_database(void *context, struct database *db)
new->target = nmem_strdup(nmem, set->target);
new->name = nmem_strdup(nmem, set->name);
new->value = nmem_strdup(nmem, set->value);
new->target = nmem_strdup(nmem, set->target);
new->name = nmem_strdup(nmem, set->name);
new->value = nmem_strdup(nmem, set->value);
- new->user = nmem_strdup(nmem, set->user);
new->next = db->settings[offset];
db->settings[offset] = new;
}
new->next = db->settings[offset];
db->settings[offset] = new;
}
@@
-347,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
@@
-365,6
+371,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();
@@
-374,8
+386,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);
}
/*
}
/*