X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=a23c6fdb71728c9336a7741c2bf7d1e59ec43eb0;hb=f7bf5626d6ae623cbcf86b8c4c9f9ed023a92499;hp=2940c25de63360975cc0d2c6275ea7bc420cbd22;hpb=1db48a73126beef112e9a3de775832173fa317f3;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index 2940c25..a23c6fd 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) 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))
@@ -201,11 +201,18 @@ static struct database_criterion *create_database_criterion(NMEM m,
         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;