X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=a23c6fdb71728c9336a7741c2bf7d1e59ec43eb0;hb=f95af5f630afa6c21b945651d864b1c86030a796;hp=4f957801de7162472e330359758fbdb4932e728c;hpb=975af84a25e086c3063390e03ff620beb2981b52;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index 4f95780..a23c6fd 100644
--- a/src/database.c
+++ b/src/database.c
@@ -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;