/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 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
*/
-
// 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.
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
-#include <dirent.h>
+#include "direntz.h"
#include <stdlib.h>
#include <sys/stat.h>
"pz:ip",
"pz:zproxy",
"pz:apdulog",
+ "pz:sru",
+ "pz:sru_version",
+ "pz:pqf_prefix",
0
};
}
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);
}
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)
- {
- 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;
- }
-#endif
if ((offset = settings_offset_cprefix(set->name)) < 0)
abort(); // Should never get here
// 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()
+static void initialize_soft_settings(void)
{
struct conf_service *service = config->servers->service;
int i;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+