From fcfd9a074ff29ffdd52e5eb0ee348fb74f0a0d17 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 20 Sep 2011 11:13:52 +0200
Subject: [PATCH] CQL/CCL to RPN. Checks for leading @

Special case, since @ precedes PQF operators.
---
 src/querytowrbuf.c   |    2 ++
 test/cql2pqf/5.5.out |    2 ++
 test/cql2pqfsample   |    1 +
 test/test_ccl.c      |    7 +++++++
 4 files changed, 12 insertions(+)
 create mode 100644 test/cql2pqf/5.5.err
 create mode 100644 test/cql2pqf/5.5.out

diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c
index 8ca78a2..109fec6 100644
--- a/src/querytowrbuf.c
+++ b/src/querytowrbuf.c
@@ -24,6 +24,8 @@ void yaz_encode_pqf_term(WRBUF b, const char *term, int len)
             break;
     if (len > 0 && i == len)
     {
+        if (term[0] == '@')
+            wrbuf_putc(b, '\\');
         for (i = 0; i<len; i++)
         {
             if (term[i] == '\\')
diff --git a/test/cql2pqf/5.5.err b/test/cql2pqf/5.5.err
new file mode 100644
index 0000000..e69de29
diff --git a/test/cql2pqf/5.5.out b/test/cql2pqf/5.5.out
new file mode 100644
index 0000000..24f2383
--- /dev/null
+++ b/test/cql2pqf/5.5.out
@@ -0,0 +1,2 @@
+Parsing CQL @and
+@attr 6=1 @attr 2=3 @attr 4=1 @attr 3=3 @attr 6=1 @attr 5=100 @attr 1=1016 "@and" 
diff --git a/test/cql2pqfsample b/test/cql2pqfsample
index a11bbd4..04f928d 100644
--- a/test/cql2pqfsample
+++ b/test/cql2pqfsample
@@ -37,3 +37,4 @@ a*\\3
 \\*a#
 \\*a*b#
 \\"
+@and
diff --git a/test/test_ccl.c b/test/test_ccl.c
index bb54243..c4fdf79 100644
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -338,6 +338,13 @@ void tst1(int pass)
                             "@and @attr 5=1 @attr 4=2 @attr 1=1016 a "
                             "@attr 4=2 @attr 1=1016 b? "));
 
+    YAZ_CHECK(tst_ccl_query(bibset, "@and",
+                            "@attr 4=2 @attr 1=1016 \\@and "));
+                            
+    YAZ_CHECK(tst_ccl_query(bibset, "a@and",
+                            "@attr 4=2 @attr 1=1016 a@and "));
+                            
+
     ccl_qual_rm(&bibset);
 }
 
-- 
1.7.10.4