X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_ccl.c;h=041efa32eb0eb98d1496de3c116002a802abaa1d;hp=5fdb9541b7cb18cfa3b8b60786a3ecca5c48c9a6;hb=HEAD;hpb=6e8f854c8a6e4c4c8993bfd728367d1092a3108c

diff --git a/test/test_ccl.c b/test/test_ccl.c
index 5fdb954..041efa3 100644
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -450,12 +450,20 @@ void tst1(int pass)
     YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a", "@attr 1=2 a "));
     YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a b", "@or "
                             "@and @attr 1=2 a @attr 1=2 b @attr 1=2 \"a b\" "));
-    YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a b c", "@or @or @or "
-                            "@and @and @attr 1=2 a @attr 1=2 b @attr 1=2 c "
-                            "@and @attr 1=2 a @attr 1=2 \"b c\" "
+
+    YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a b c", "@or @or "
+                            "@and "
+                            "@attr 1=2 a "
+                            "@or @and @attr 1=2 b @attr 1=2 c "
+                            "@attr 1=2 \"b c\" "
                             "@and @attr 1=2 \"a b\" @attr 1=2 c "
                             "@attr 1=2 \"a b c\" "));
 
+    YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a?", 0));
+    YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a b?", 0));
+    YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a b c?", 0));
+    YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a b c d?", 0));
+
     YAZ_CHECK(tst_ccl_query(bibset, "s2=a", "@or @attr 1=2 a @attr 1=3 a "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "s2=a b", "@or "
@@ -467,6 +475,15 @@ void tst1(int pass)
     YAZ_CHECK(tst_ccl_query(bibset, "s2=a b?", 0));
     YAZ_CHECK(tst_ccl_query(bibset, "s2=a b? c", 0));
 
+    YAZ_CHECK(tst_ccl_query(bibset, "z=(ti=b)", "@attr 4=2 @attr 1=4 b "));
+    YAZ_CHECK(tst_ccl_query(bibset, "z=(ti=b?)",
+                            "@attr 5=1 @attr 4=2 @attr 1=4 b "));
+    YAZ_CHECK(tst_ccl_query(bibset, "z=(a? and ti=b? and c?)",
+                            "@and @and "
+                            "@attr 5=104 a? "
+                            "@attr 5=1 @attr 4=2 @attr 1=4 b "
+                            "@attr 5=104 c? "));
+
     ccl_qual_rm(&bibset);
 }
 
@@ -523,6 +540,31 @@ void tst2(void)
 }
 
 
+void tst3(void)
+{
+    CCL_bibset b = ccl_qual_mk();
+
+    YAZ_CHECK(b);
+    if (!b)
+        return;
+
+    ccl_qual_fitem(b, "2=102", "rk");
+    ccl_qual_fitem(b, "1=9903 r=r", "lex");
+    ccl_qual_fitem(b, "4=109 r=o", "st-numeric");
+
+    YAZ_CHECK(tst_ccl_query(b, "rk=(lex=9)", "@attr 2=3 @attr 1=9903 9 "));
+    YAZ_CHECK(tst_ccl_query(b, "rk=(lex>9)", "@attr 2=5 @attr 1=9903 9 "));
+    YAZ_CHECK(tst_ccl_query(b, "rk=(lex,st-numeric=300-600)",
+                            "@and "
+                            "@attr 2=4 @attr 4=109 @attr 1=9903 300 "
+                            "@attr 2=2 @attr 4=109 @attr 1=9903 600 "));
+    YAZ_CHECK(tst_ccl_query(b, "rk=(lex=9) and b",
+                            "@and @attr 2=3 @attr 1=9903 9 b "));
+    YAZ_CHECK(tst_ccl_query(b, "rk=(lex=9 and b)",
+                            "@and @attr 2=3 @attr 1=9903 9 @attr 2=102 b "));
+    ccl_qual_rm(&b);
+}
+
 void tst_addinfo(void)
 {
     const char *addinfo;
@@ -562,6 +604,7 @@ int main(int argc, char **argv)
     tst1(2);
     tst1(3);
     tst2();
+    tst3();
     tst_addinfo();
     YAZ_CHECK_TERM;
 }