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

diff --git a/test/test_ccl.c b/test/test_ccl.c
index de611d3..5fdb954 100644
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 #if HAVE_CONFIG_H
@@ -77,16 +77,18 @@ void tst1(int pass)
     switch(pass)
     {
     case 0:
+        ccl_qual_fitem(bibset, "term dc.title", "comb");
         ccl_qual_fitem(bibset, "u=4    s=pw t=l,r", "ti");
         ccl_qual_fitem(bibset, "1=1016 s=al,pw t=r",    "term");
         ccl_qual_fitem(bibset, "t=x", "reg");
         ccl_qual_fitem(bibset, "t=z", "z");
         ccl_qual_fitem(bibset, "1=/my/title",       "dc.title");
-        ccl_qual_fitem(bibset, "r=r",         "date");
+        ccl_qual_fitem(bibset, "r=r,omiteq",        "date");
         ccl_qual_fitem(bibset, "r=o",         "x");
         ccl_qual_fitem(bibset, "dc.title", "title");
-        ccl_qual_fitem(bibset, "term dc.title", "comb");
         ccl_qual_fitem(bibset, "s=ag", "ag");
+        ccl_qual_fitem(bibset, "s=sl u=2", "splitlist");
+        ccl_qual_fitem(bibset, "s=sl u=2 u=3", "s2");
         break;
     case 1:
         strcpy(tstline, "ti u=4    s=pw t=l,r");
@@ -104,7 +106,7 @@ void tst1(int pass)
         strcpy(tstline, "dc.title 1=/my/title");
         ccl_qual_line(bibset, tstline);
 
-        strcpy(tstline, "date r=r # ordered relation");
+        strcpy(tstline, "date r=r,omiteq # ordered relation");
         ccl_qual_line(bibset, tstline);
 
         strcpy(tstline, "x r=o # ordered relation");
@@ -118,6 +120,12 @@ void tst1(int pass)
 
         strcpy(tstline, "ag s=ag");
         ccl_qual_line(bibset, tstline);
+
+        strcpy(tstline, "splitlist s=sl u=2");
+        ccl_qual_line(bibset, tstline);
+
+        strcpy(tstline, "s2 s=sl u=2 u=3");
+        ccl_qual_line(bibset, tstline);
         break;
     case 2:
         ccl_qual_buf(bibset, "ti u=4    s=pw t=l,r\n"
@@ -126,11 +134,13 @@ void tst1(int pass)
                      "reg t=x\r\n"
                      "z t=z\r\n"
                      "dc.title 1=/my/title\n"
-                     "date r=r\n"
+                     "date r=r,omiteq\n"
                      "x r=o\n"
                      "title dc.title\n"
                      "comb term dc.title\n"
                      "ag s=ag\n"
+                     "splitlist s=sl u=2\n"
+                     "s2 s=sl u=2 u=3\n"
             );
         break;
     case 3:
@@ -162,7 +172,7 @@ void tst1(int pass)
                 "   <attr type=\"1\" value=\"/my/title\"/>\n"
                 " </qual>\n"
                 " <qual name=\"date\">\n"
-                "   <attr type=\"r\" value=\"r\"/>\n"
+                "   <attr type=\"r\" value=\"r,omiteq\"/>\n"
                 " </qual>\n"
                 " <qual name=\"x\">\n"
                 "   <attr type=\"r\" value=\"o\"/>\n"
@@ -177,6 +187,15 @@ void tst1(int pass)
                 " <qual name=\"ag\">\n"
                 "   <attr type=\"s\" value=\"ag\"/>\n"
                 " </qual>\n"
+                " <qual name=\"splitlist\">\n"
+                "   <attr type=\"s\" value=\"sl\"/>\n"
+                "   <attr type=\"u\" value=\"2\"/>\n"
+                " </qual>\n"
+                " <qual name=\"s2\">\n"
+                "   <attr type=\"s\" value=\"sl\"/>\n"
+                "   <attr type=\"u\" value=\"2\"/>\n"
+                "   <attr type=\"u\" value=\"3\"/>\n"
+                " </qual>\n"
                 "</cclmap>\n";
 
             doc = xmlParseMemory(xml_str, strlen(xml_str));
@@ -260,10 +279,11 @@ void tst1(int pass)
                   "@attr 4=2 @attr 1=1016 b "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "a% (b or dc.title=c)",
-                  "@prox 0 1 0 2 k 2 "
-                  "@attr 4=2 @attr 1=1016 a "
-                  "@or @attr 4=2 @attr 1=1016 b "
-                            "@attr 4=2 @attr 1=1016 @attr 1=/my/title c "));
+                            "@prox 0 1 0 2 k 2 "
+                            "@attr 4=2 @attr 1=1016 a "
+                            "@or @attr 4=2 @attr 1=1016 b "
+                            "@attr 4=2 @attr 1=/my/title c "
+    ));
 
     YAZ_CHECK(tst_ccl_query(bibset, "(a b) % (c)",
                             "@prox 0 1 0 2 k 2 @and "
@@ -271,9 +291,17 @@ void tst1(int pass)
                             "@attr 4=2 @attr 1=1016 c " ));
 
     YAZ_CHECK(tst_ccl_query(bibset, "date=1980",
-                            "@attr 2=3 1980 "));
+                            "1980 "));
     YAZ_CHECK(tst_ccl_query(bibset, "(date=1980)",
-                            "@attr 2=3 1980 "));
+                            "1980 "));
+    YAZ_CHECK(tst_ccl_query(bibset, "date>1980",
+                            "@attr 2=5 1980 "));
+    YAZ_CHECK(tst_ccl_query(bibset, "date>=1980",
+                            "@attr 2=4 1980 "));
+    YAZ_CHECK(tst_ccl_query(bibset, "date<1980",
+                            "@attr 2=1 1980 "));
+    YAZ_CHECK(tst_ccl_query(bibset, "date<=1980",
+                            "@attr 2=2 1980 "));
     YAZ_CHECK(tst_ccl_query(bibset, "date=234-1990",
                             "@and @attr 2=4 234 @attr 2=2 1990 "));
     YAZ_CHECK(tst_ccl_query(bibset, "date=234- 1990",
@@ -324,22 +352,25 @@ void tst1(int pass)
                             "@attr 5=104 a?b#c\\\\? "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "reg=\\(",
-                            "@attr 5=102 \\\\( "));
+                            "( "));
     YAZ_CHECK(tst_ccl_query(bibset, "z=\\(",
                             "( "));
 
+    YAZ_CHECK(tst_ccl_query(bibset, "z=a b#",
+                            "@attr 5=104 \"a b#\" "));
+
     YAZ_CHECK(tst_ccl_query(bibset, "reg=\\\"",
                             "\"\\\"\" "));
     YAZ_CHECK(tst_ccl_query(bibset, "z=\\\"",
                             "\"\\\"\" "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "reg=.",
-                            "@attr 5=102 \\\\. "));
+                            ". "));
     YAZ_CHECK(tst_ccl_query(bibset, "z=.",
                             ". "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "reg=\".\"",
-                            "@attr 5=102 \\\\. "));
+                            ". "));
     YAZ_CHECK(tst_ccl_query(bibset, "z=\".\"",
                             ". "));
 
@@ -349,14 +380,14 @@ void tst1(int pass)
                             "@attr 5=104 ?\\\\? "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "reg=\"?\\?\"",
-                            "@attr 5=102 \\\\?\\\\? "));
+                            "?? "));
     YAZ_CHECK(tst_ccl_query(bibset, "z=\"?\\?\"",
-                            "@attr 5=104 \\\\?\\\\? "));
+                            "?? "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "reg=\\\\",
-                            "@attr 5=102 \\\\\\\\ "));
+                            "\\\\ "));
     YAZ_CHECK(tst_ccl_query(bibset, "z=\\\\",
-                            "@attr 5=104 \\\\\\\\ "));
+                            "\\\\ "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "\\\\",
                             "@attr 4=2 @attr 1=1016 \\\\ "));
@@ -415,6 +446,27 @@ void tst1(int pass)
 
     YAZ_CHECK(tst_ccl_query(bibset, "ag=\"a b c\" \"d e\"",
                             "@and @attr 4=1 \"a b c\" @attr 4=1 \"d e\" "));
+
+    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\" "
+                            "@and @attr 1=2 \"a b\" @attr 1=2 c "
+                            "@attr 1=2 \"a b c\" "));
+
+    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 "
+                            "@and " "@or @attr 1=2 a @attr 1=3 a "
+                            "@or @attr 1=2 b @attr 1=3 b "
+                            "@or @attr 1=2 \"a b\" @attr 1=3 \"a b\" "));
+
+    YAZ_CHECK(tst_ccl_query(bibset, "s2=a? b", 0));
+    YAZ_CHECK(tst_ccl_query(bibset, "s2=a b?", 0));
+    YAZ_CHECK(tst_ccl_query(bibset, "s2=a b? c", 0));
+
     ccl_qual_rm(&bibset);
 }
 
@@ -429,6 +481,12 @@ void tst2(void)
     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 5=104 @attr 4=2 @attr 1=1016 a?# "));
+
+    YAZ_CHECK(tst_ccl_query(bibset, "a b?#",
+                            "@and @attr 4=2 @attr 1=1016 a @attr 5=104 @attr 4=2 @attr 1=1016 b?# "));
+
     YAZ_CHECK(tst_ccl_query(bibset, "a*",
                             "@attr 4=2 @attr 1=1016 a* "));
 
@@ -440,7 +498,17 @@ void tst2(void)
                             "@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\\\\? "));
+                            "@attr 4=2 @attr 1=1016 a? "));
+
+    ccl_qual_fitem(bibset, "?", "@mask");
+    YAZ_CHECK(tst_ccl_query(bibset, "a?",
+                            "@attr 5=104 @attr 4=2 @attr 1=1016 a# "));
+
+
+    ccl_qual_fitem(bibset, "", "@mask");
+    ccl_qual_fitem(bibset, "", "@truncation");
+    YAZ_CHECK(tst_ccl_query(bibset, "a?#",
+                            "@attr 4=2 @attr 1=1016 a?# "));
 
     ccl_qual_fitem(bibset, "og", "@and");
     ccl_qual_fitem(bibset, "eller", "@or");
@@ -455,6 +523,36 @@ void tst2(void)
 }
 
 
+void tst_addinfo(void)
+{
+    const char *addinfo;
+    int r;
+    CCL_bibset bibset = ccl_qual_mk();
+
+    r = ccl_qual_fitem2(bibset, "u=4    s=pw t=l,r", "ti", &addinfo);
+    YAZ_CHECK(r == 0 && addinfo == 0);
+
+    r = ccl_qual_fitem2(bibset, "1=1016 s=al,pw t=z", "term", &addinfo);
+    YAZ_CHECK(r == 0 && addinfo == 0);
+
+    r = ccl_qual_fitem2(bibset, "x=", "term", &addinfo);
+    YAZ_CHECK(r != 0 && addinfo != 0);
+
+    r = ccl_qual_fitem2(bibset, "12=3", "term", &addinfo);
+    YAZ_CHECK(r == 0 && addinfo == 0);
+
+    r = ccl_qual_fitem2(bibset, "ab=3", "term", &addinfo);
+    YAZ_CHECK(r != 0 && addinfo != 0);
+
+    r = ccl_qual_fitem2(bibset, "x=ab", "term", &addinfo);
+    YAZ_CHECK(r != 0 && addinfo != 0);
+
+    r = ccl_qual_fitem2(bibset, "s=ab", "term", &addinfo);
+    YAZ_CHECK(r == 0 && addinfo == 0);
+
+    ccl_qual_rm(&bibset);
+}
+
 int main(int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
@@ -464,6 +562,7 @@ int main(int argc, char **argv)
     tst1(2);
     tst1(3);
     tst2();
+    tst_addinfo();
     YAZ_CHECK_TERM;
 }
 /*