X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_cql2ccl.c;h=ecb9be6970a2c9dafbc15585a3e28d558e1319fc;hp=06a1c6171d7bd88c2bb64f97a7ecd69f7b46ae4d;hb=ee3683039be09b0843e3159426ea0eeecb3777ac;hpb=9084e20f4c5ffad9cfea2087396206b75a3a6654

diff --git a/test/test_cql2ccl.c b/test/test_cql2ccl.c
index 06a1c61..ecb9be6 100644
--- a/test/test_cql2ccl.c
+++ b/test/test_cql2ccl.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 #if HAVE_CONFIG_H
@@ -110,7 +110,8 @@ static void tst(void)
     YAZ_CHECK(tst_query("\\*", "\"*\""));
     YAZ_CHECK(tst_query("\"\\*\"", "\"*\""));
 
-    YAZ_CHECK(tst_query("\"a b\"", "\"a b\""));
+    YAZ_CHECK(tst_query("a b", "\"a\" \"b\""));
+    YAZ_CHECK(tst_query("ab bc", "\"ab\" \"bc\""));
 
     YAZ_CHECK(tst_query("\\\\", "\"\\\\\""));
     YAZ_CHECK(tst_query("\\\"", "\"\\\"\""));
@@ -130,12 +131,17 @@ static void tst(void)
     YAZ_CHECK(tst_query("title all \"\"", "title=\"\""));
 
     YAZ_CHECK(tst_query("title all x", "title=\"x\""));
+    YAZ_CHECK(tst_query("title all x y", "title=\"x\" and title=\"y\""));
     YAZ_CHECK(tst_query("title all \"x y\"", "title=\"x\" and title=\"y\""));
 
     YAZ_CHECK(tst_query("title any x", "title=\"x\""));
+    YAZ_CHECK(tst_query("title any x y", "title=\"x\" or title=\"y\""));
     YAZ_CHECK(tst_query("title any \"x y\"", "title=\"x\" or title=\"y\""));
 
     YAZ_CHECK(tst_query("title = \"x y\"", "title=\"x y\""));
+    YAZ_CHECK(tst_query("title = x y", "title=\"x\" \"y\""));
+
+    YAZ_CHECK(tst_query("title = x y z",  "title=\"x\" \"y\" \"z\""));
 
     YAZ_CHECK(tst_query("dc.title=encyclopedia prox dinosaurs",
                         "(dc.title=\"encyclopedia\") % (\"dinosaurs\")"));