/* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) 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
#include "ppmutex.h"
#include "session.h"
-#include "host.h"
#include "pazpar2_config.h"
#include "settings.h"
#include "http.h"
struct database *new_database(const char *id, NMEM nmem)
{
+ return new_database_inherit_settings(id, nmem, 0);
+}
+struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings)
+{
struct database *db;
struct setting *idset;
db = nmem_malloc(nmem, sizeof(*db));
db->id = nmem_strdup(nmem, id);
- db->num_settings = PZ_MAX_EOF;
- db->settings = nmem_malloc(nmem, sizeof(struct settings*) *
- db->num_settings);
db->next = 0;
- memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
+
+ if (service_settings && service_settings->num_settings > 0) {
+ yaz_log(YLOG_DEBUG, "copying settings from service to database %s settings", db->id);
+ db->num_settings = service_settings->num_settings;
+ db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
+ // Initialize database settings with service settings
+ memcpy(db->settings, service_settings->settings, sizeof(*db->settings) * db->num_settings);
+ }
+ else {
+ yaz_log(YLOG_DEBUG, "No service settings to database %s ", db->id);
+ db->num_settings = PZ_MAX_EOF;
+ db->settings = nmem_malloc(nmem, sizeof(*db->settings) * db->num_settings);
+ memset(db->settings, 0, sizeof(*db->settings) * db->num_settings);
+ }
idset = nmem_malloc(nmem, sizeof(*idset));
idset->precedence = 0;
idset->name = "pz:id";
idset->target = idset->value = db->id;
- idset->next = 0;
+ idset->next = db->settings[PZ_ID];
db->settings[PZ_ID] = idset;
return db;
for (p = service->databases; p; p = p->next)
if (!strcmp(p->id, id))
return p;
-
- p = new_database(id, service->nmem);
-
+
+ yaz_log(YLOG_DEBUG, "new database %s under service %s", id,
+ service->id ? service->id : "null");
+ p = new_database_inherit_settings(id, service->nmem, service->settings);
p->next = service->databases;
service->databases = p;
// This will be generalized at some point
static int match_criterion(struct setting **settings,
- struct conf_service *service,
+ struct conf_service *service,
struct database_criterion *c)
{
int offset = settings_lookup_offset(service, c->name);
if (match_zurl(settings[offset]->value, v->value))
break;
}
- else
+ else
{
if (!strcmp(settings[offset]->value, v->value))
break;
}
- }
+ }
else if (c->type == PAZPAR2_SUBSTRING_MATCH)
{
if (strstr(settings[offset]->value, v->value))
int subi;
struct database_criterion *new = nmem_malloc(m, sizeof(*new));
char *eq;
- if ((eq = strchr(values[i], '=')))
- new->type = PAZPAR2_STRING_MATCH;
- else if ((eq = strchr(values[i], '~')))
- new->type = PAZPAR2_SUBSTRING_MATCH;
- else
+ for (eq = values[i]; *eq; eq++)
+ if (*eq == '=')
+ {
+ new->type = PAZPAR2_STRING_MATCH;
+ break;
+ }
+ else if (*eq == '~')
+ {
+ new->type = PAZPAR2_SUBSTRING_MATCH;
+ break;
+ }
+ if (!*eq)
{
yaz_log(YLOG_WARN, "Missing equal-sign/tilde in filter");
return 0;