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

diff --git a/test/test_ccl.c b/test/test_ccl.c
index a0b76a0..041efa3 100644
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -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",
@@ -418,6 +446,44 @@ 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 "
+                            "@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 "
+                            "@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));
+
+    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);
 }
 
@@ -474,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;
@@ -513,6 +604,7 @@ int main(int argc, char **argv)
     tst1(2);
     tst1(3);
     tst2();
+    tst3();
     tst_addinfo();
     YAZ_CHECK_TERM;
 }