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
Happy new year
[pazpar2-moved-to-github.git]
/
src
/
database.c
diff --git
a/src/database.c
b/src/database.c
index
d59ce34
..
4f95780
100644
(file)
--- a/
src/database.c
+++ b/
src/database.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* 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
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
@@
-99,8
+99,9
@@
struct database *create_database_for_service(const char *id,
for (p = service->databases; p; p = p->next)
if (!strcmp(p->id, id))
return p;
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);
+
+ 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;
p = new_database_inherit_settings(id, service->nmem, service->settings);
p->next = service->databases;
service->databases = p;
@@
-141,7
+142,7
@@
int match_zurl(const char *zurl, const char *pattern)
// This will be generalized at some point
static int match_criterion(struct setting **settings,
// 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);
struct database_criterion *c)
{
int offset = settings_lookup_offset(service, c->name);
@@
-163,12
+164,12
@@
static int match_criterion(struct setting **settings,
if (match_zurl(settings[offset]->value, v->value))
break;
}
if (match_zurl(settings[offset]->value, v->value))
break;
}
- else
+ else
{
if (!strcmp(settings[offset]->value, v->value))
break;
}
{
if (!strcmp(settings[offset]->value, v->value))
break;
}
- }
+ }
else if (c->type == PAZPAR2_SUBSTRING_MATCH)
{
if (strstr(settings[offset]->value, v->value))
else if (c->type == PAZPAR2_SUBSTRING_MATCH)
{
if (strstr(settings[offset]->value, v->value))