First work on YAZ-781

[yaz-moved-to-github.git] / test / test_ccl.c

diff --git a/test/test_ccl.c b/test/test_ccl.c
index 4841260..fc244b6 100644 (file)
--- 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-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 #if HAVE_CONFIG_H
@@ -77,15 +77,15 @@ 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");
         break;
     case 1:
@@ -104,7 +104,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");
@@ -126,7 +126,7 @@ 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"
@@ -162,7 +162,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"
@@ -260,10 +260,16 @@ 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 "
+#if YAZ_781
+                            "@or @attr 4=2 @attr 1=/my/title c "
+                            "@attr 4=2 @attr 1=1016 c "
+#else
+                            "@attr 4=2 @attr 1=1016 @attr 1=/my/title c "
+#endif
+    ));
 
     YAZ_CHECK(tst_ccl_query(bibset, "(a b) % (c)",
                             "@prox 0 1 0 2 k 2 @and "
@@ -271,9 +277,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",