X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_ccl.c;h=bd5ecb6bd8149b6784454ae72bc71b069c809233;hb=871f1239cc0c8a2d4b2bd16a918a39c97633faa8;hp=bb54243e78d28e9bf99c9b9e376d50accdd3b7b2;hpb=c508282c3e52e145f998d0bb85c0ea6b36fe956c;p=yaz-moved-to-github.git

diff --git a/test/test_ccl.c b/test/test_ccl.c
index bb54243..bd5ecb6 100644
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -338,9 +338,64 @@ 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 "));
+                           
+    YAZ_CHECK(tst_ccl_query(bibset, "}",
+                            "@attr 4=2 @attr 1=1016 } "));
+    
+    YAZ_CHECK(tst_ccl_query(bibset, "{",
+                            "@attr 4=2 @attr 1=1016 \"{\" "));
+
+    YAZ_CHECK(tst_ccl_query(bibset, "\"a b c\"",
+                            "@attr 4=1 @attr 1=1016 \"a b c\" "));
+
+    YAZ_CHECK(tst_ccl_query(bibset, "\"a b  c  \"",
+                            "@attr 4=1 @attr 1=1016 \"a b  c  \" "));
+
     ccl_qual_rm(&bibset);
 }
 
+void tst2(void)
+{
+    CCL_bibset bibset = ccl_qual_mk();
+
+    YAZ_CHECK(bibset);
+    if (!bibset)
+        return;
+
+    ccl_qual_fitem(bibset, "u=4    s=pw t=l,r", "ti");
+    ccl_qual_fitem(bibset, "1=1016 s=al,pw t=z",    "term");
+
+    YAZ_CHECK(tst_ccl_query(bibset, "a*",
+                            "@attr 4=2 @attr 1=1016 a* "));
+
+    YAZ_CHECK(tst_ccl_query(bibset, "a?",
+                            "@attr 5=104 @attr 4=2 @attr 1=1016 a? "));
+
+    ccl_qual_fitem(bibset, "*", "@truncation");
+    YAZ_CHECK(tst_ccl_query(bibset, "a*",
+                            "@attr 5=104 @attr 4=2 @attr 1=1016 a? "));
+
+    YAZ_CHECK(tst_ccl_query(bibset, "a?",
+                            "@attr 5=104 @attr 4=2 @attr 1=1016 a\\\\? "));
+
+    ccl_qual_fitem(bibset, "og", "@and");
+    ccl_qual_fitem(bibset, "eller", "@or");
+    ccl_qual_fitem(bibset, "ikke", "@not");
+
+    YAZ_CHECK(tst_ccl_query(bibset, "a og b eller c ikke d",
+                            "@not @or @and @attr 4=2 @attr 1=1016 a "
+                            "@attr 4=2 @attr 1=1016 b "
+                            "@attr 4=2 @attr 1=1016 c "
+                            "@attr 4=2 @attr 1=1016 d "));
+    ccl_qual_rm(&bibset);
+}
+
+
 int main(int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
@@ -349,6 +404,7 @@ int main(int argc, char **argv)
     tst1(1);
     tst1(2);
     tst1(3);
+    tst2();
     YAZ_CHECK_TERM;
 }
 /*