From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 18 Sep 2013 09:29:55 +0000 (+0200)
Subject: Merge branch 'master' into sru_2_0
X-Git-Tag: v5.0.0~36
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=a5b0faf7d5c4311af8969128b9a93cd2d55be21d;hp=4f3418e14ebbb9371444f39636baa36d20e802d1

Merge branch 'master' into sru_2_0
---

diff --git a/src/cclfind.c b/src/cclfind.c
index aa4b303..8a74f5b 100644
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -687,9 +687,14 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
         if (KIND == CCL_TOK_TERM)
         {
             size_t i;
+            int quote_mode = 0;
             for (i = 0; i<cclp->look_token->len; i++)
             {
-                if (cclp->look_token->name[i] == '-')
+                if (i > 0 && cclp->look_token->name[i] == '\\')
+                    ;
+                else if (cclp->look_token->name[i] == '"')
+                    quote_mode = !quote_mode;
+                else if (cclp->look_token->name[i] == '-' && !quote_mode)
                     break;
             }