/* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) 2006-2013 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
{
return new_database_inherit_settings(id, nmem, 0);
}
-struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings *service_settings)
+struct database *new_database_inherit_settings(const char *id, NMEM nmem, struct settings_array *service_settings)
{
struct database *db;
struct setting *idset;
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(struct settings*) * db->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(struct settings*) * db->num_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(struct settings*) * db->num_settings);
- memset(db->settings, 0, sizeof(struct settings*) * db->num_settings);
+ 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;
for (p = service->databases; p; p = p->next)
if (!strcmp(p->id, id))
return p;
-
- yaz_log(YLOG_DEBUG, "new database %s under service %s", id, service->id);
- p = new_database_inherit_settings(id, service->nmem, service->settings);
+ 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))