From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 24 Jun 2014 12:07:35 +0000 (+0200)
Subject: Fix broken ~ match if filter contains = PAZ-941
X-Git-Tag: v1.7.0~4
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=85f0bc6a7b05365b09f8f3ed113123729d6e05ab;p=pazpar2-moved-to-github.git

Fix broken ~ match if filter contains = PAZ-941
---

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;