X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_ccl.c;h=d189f004a42f85ca4750fb0c072d16d57243ef77;hp=5b5d571bcbd2675f6b0e890f2e463fd98f30ffdb;hb=05e94adc1a717e85ba5b775468c3c9e2c8a26034;hpb=7e12528ec54fa937612c94a936f02872d9a6ca5c

diff --git a/test/test_ccl.c b/test/test_ccl.c
index 5b5d571..d189f00 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) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 #if HAVE_CONFIG_H
@@ -22,14 +22,14 @@ static int tst_ccl_query(CCL_bibset bibset,
     if (parser && bibset)
     {
         struct ccl_rpn_node *rpn;
-        
+
         rpn = ccl_parser_find_str(parser, query);
         if (rpn)
         {
             /* parse ok. check that result is there and match */
             WRBUF wrbuf = wrbuf_alloc();
             ccl_pquery(wrbuf, rpn);
-            
+
             /* check expect a result and that it matches */
             if (result && !strcmp(wrbuf_cstr(wrbuf), result))
                 ret = 1;
@@ -43,7 +43,7 @@ static int tst_ccl_query(CCL_bibset bibset,
             ccl_rpn_delete(rpn);
             wrbuf_destroy(wrbuf);
         }
-        else 
+        else
         {
             if (result)
             {
@@ -86,7 +86,7 @@ void tst1(int pass)
         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,pw", "ag");
+        ccl_qual_fitem(bibset, "s=ag", "ag");
         break;
     case 1:
         strcpy(tstline, "ti u=4    s=pw t=l,r");
@@ -116,7 +116,7 @@ void tst1(int pass)
         strcpy(tstline, "comb term dc.title # combination");
         ccl_qual_line(bibset, tstline);
 
-        strcpy(tstline, "ag s=ag,pw");
+        strcpy(tstline, "ag s=ag");
         ccl_qual_line(bibset, tstline);
         break;
     case 2:
@@ -126,11 +126,11 @@ 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\n"
                      "x r=o\n"
                      "title dc.title\n"
                      "comb term dc.title\n"
-                     "ag s=ag,pw\n"
+                     "ag s=ag\n"
             );
         break;
     case 3:
@@ -140,7 +140,7 @@ void tst1(int pass)
             xmlDocPtr doc;
             int r;
             const char *addinfo = 0;
-            const char *xml_str = 
+            const char *xml_str =
                 "<cclmap>\n"
                 " <qual name=\"ti\">\n"
                 "   <attr type=\"u\" value=\"4\"/>\n"
@@ -175,10 +175,10 @@ void tst1(int pass)
                 "   <qual name=\"dc.title\"/>\n"
                 " </qual>\n"
                 " <qual name=\"ag\">\n"
-                "   <attr type=\"s\" value=\"ag,pw\"/>\n"
+                "   <attr type=\"s\" value=\"ag\"/>\n"
                 " </qual>\n"
                 "</cclmap>\n";
-            
+
             doc = xmlParseMemory(xml_str, strlen(xml_str));
             YAZ_CHECK(doc);
 
@@ -195,7 +195,7 @@ void tst1(int pass)
         YAZ_CHECK(0);
         return;
     }
-    
+
     YAZ_CHECK(tst_ccl_query(bibset, "x1", "@attr 4=2 @attr 1=1016 x1 "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "k\xc3\xb8" "benhavn", "@attr 4=2 @attr 1=1016 k\xc3\xb8" "benhavn "));
@@ -213,59 +213,59 @@ void tst1(int pass)
     YAZ_CHECK(tst_ccl_query(bibset, "x1 and", 0));
     YAZ_CHECK(tst_ccl_query(bibset, "tix=x5", 0));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "a%b", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a%b",
                   "@prox 0 1 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
-    YAZ_CHECK(tst_ccl_query(bibset, "a%(b)", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a%(b)",
                   "@prox 0 1 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
-    YAZ_CHECK(tst_ccl_query(bibset, "(a)%(b)", 
+    YAZ_CHECK(tst_ccl_query(bibset, "(a)%(b)",
                   "@prox 0 1 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
-    YAZ_CHECK(tst_ccl_query(bibset, "a%1b", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a%1b",
                   "@prox 0 1 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "a%2b", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a%2b",
                   "@prox 0 2 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "(a)%2(b)", 
+    YAZ_CHECK(tst_ccl_query(bibset, "(a)%2(b)",
                   "@prox 0 2 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "a%19b", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a%19b",
                   "@prox 0 19 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "spid%æserne", 
+    YAZ_CHECK(tst_ccl_query(bibset, "spid%æserne",
                   "@prox 0 1 0 2 k 2 "
                   "@attr 4=2 @attr 1=1016 spid "
                   "@attr 4=2 @attr 1=1016 æserne "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "a!b", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a!b",
                   "@prox 0 1 1 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
-    YAZ_CHECK(tst_ccl_query(bibset, "a!2b", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a!2b",
                   "@prox 0 2 1 2 k 2 "
                   "@attr 4=2 @attr 1=1016 a "
                   "@attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "a% (b or dc.title=c)", 
+    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 "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "(a b) % (c)", 
+    YAZ_CHECK(tst_ccl_query(bibset, "(a b) % (c)",
                             "@prox 0 1 0 2 k 2 @and "
                             "@attr 4=2 @attr 1=1016 a @attr 4=2 @attr 1=1016 b "
                             "@attr 4=2 @attr 1=1016 c " ));
@@ -307,30 +307,30 @@ void tst1(int pass)
 
     YAZ_CHECK(tst_ccl_query(bibset, "a?",
                             "@attr 5=1 @attr 4=2 @attr 1=1016 a "));
-    YAZ_CHECK(tst_ccl_query(bibset, "a b", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a b",
                             "@and @attr 4=2 @attr 1=1016 a "
                             "@attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "a b?", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a b?",
                             "@and @attr 4=2 @attr 1=1016 a "
                             "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "title=a", 
+    YAZ_CHECK(tst_ccl_query(bibset, "title=a",
                             "@attr 1=/my/title a "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "reg=a?b#\"c?\"", 
+    YAZ_CHECK(tst_ccl_query(bibset, "reg=a?b#\"c?\"",
                             "@attr 5=102 a.*b.c\\\\? "));
-    YAZ_CHECK(tst_ccl_query(bibset, "z=a?b#\"c?\"", 
+    YAZ_CHECK(tst_ccl_query(bibset, "z=a?b#\"c?\"",
                             "@attr 5=104 a?b#c\\\\? "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "reg=\\(", 
+    YAZ_CHECK(tst_ccl_query(bibset, "reg=\\(",
                             "@attr 5=102 \\\\( "));
-    YAZ_CHECK(tst_ccl_query(bibset, "z=\\(", 
+    YAZ_CHECK(tst_ccl_query(bibset, "z=\\(",
                             "( "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "reg=\\\"", 
+    YAZ_CHECK(tst_ccl_query(bibset, "reg=\\\"",
                             "\"\\\"\" "));
-    YAZ_CHECK(tst_ccl_query(bibset, "z=\\\"", 
+    YAZ_CHECK(tst_ccl_query(bibset, "z=\\\"",
                             "\"\\\"\" "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "reg=.",
@@ -338,9 +338,9 @@ void tst1(int pass)
     YAZ_CHECK(tst_ccl_query(bibset, "z=.",
                             ". "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "reg=\".\"", 
+    YAZ_CHECK(tst_ccl_query(bibset, "reg=\".\"",
                             "@attr 5=102 \\\\. "));
-    YAZ_CHECK(tst_ccl_query(bibset, "z=\".\"", 
+    YAZ_CHECK(tst_ccl_query(bibset, "z=\".\"",
                             ". "));
 
     YAZ_CHECK(tst_ccl_query(bibset, "reg=?\\?",
@@ -358,30 +358,30 @@ void tst1(int pass)
     YAZ_CHECK(tst_ccl_query(bibset, "z=\\\\",
                             "@attr 5=104 \\\\\\\\ "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "\\\\", 
+    YAZ_CHECK(tst_ccl_query(bibset, "\\\\",
                             "@attr 4=2 @attr 1=1016 \\\\ "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "comb=a", 
+    YAZ_CHECK(tst_ccl_query(bibset, "comb=a",
                             "@or @attr 4=2 @attr 1=1016 a "
                             "@attr 1=/my/title a "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "a? b?", 
+    YAZ_CHECK(tst_ccl_query(bibset, "a? b?",
                             "@and @attr 5=1 @attr 4=2 @attr 1=1016 a "
                             "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
 
-    YAZ_CHECK(tst_ccl_query(bibset, "\"a\"? \"b?\"", 
+    YAZ_CHECK(tst_ccl_query(bibset, "\"a\"? \"b?\"",
                             "@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 \"{\" "));
 
@@ -412,7 +412,7 @@ void tst1(int pass)
 
     YAZ_CHECK(tst_ccl_query(bibset, "ag=\"a b c\"",
                             "@attr 4=1 \"a b c\" "));
- 
+
     YAZ_CHECK(tst_ccl_query(bibset, "ag=\"a b c\" \"d e\"",
                             "@and @attr 4=1 \"a b c\" @attr 4=1 \"d e\" "));
     ccl_qual_rm(&bibset);
@@ -429,6 +429,9 @@ 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*",
                             "@attr 4=2 @attr 1=1016 a* "));
 
@@ -442,6 +445,16 @@ void tst2(void)
     YAZ_CHECK(tst_ccl_query(bibset, "a?",
                             "@attr 5=104 @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 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");
@@ -455,6 +468,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 +507,7 @@ int main(int argc, char **argv)
     tst1(2);
     tst1(3);
     tst2();
+    tst_addinfo();
     YAZ_CHECK_TERM;
 }
 /*