X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=1fa4097f524f0e90513de42707c182063904f4be;hb=1b2621985f8d74b4d093f780fb952ee3d032c87d;hp=2940c25de63360975cc0d2c6275ea7bc420cbd22;hpb=1db48a73126beef112e9a3de775832173fa317f3;p=pazpar2-moved-to-github.git diff --git a/src/database.c b/src/database.c index 2940c25..1fa4097 100644 --- a/src/database.c +++ b/src/database.c @@ -1,5 +1,5 @@ /* 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 @@ -99,7 +99,7 @@ struct database *create_database_for_service(const char *id, 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 ? service->id : "null"); p = new_database_inherit_settings(id, service->nmem, service->settings); @@ -142,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, - struct conf_service *service, + struct conf_service *service, struct database_criterion *c) { int offset = settings_lookup_offset(service, c->name); @@ -164,12 +164,12 @@ static int match_criterion(struct setting **settings, 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))