X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_ccl.c;h=5fdb9541b7cb18cfa3b8b60786a3ecca5c48c9a6;hb=eb556013557ef8c9e76c52614f88c059ec443c95;hp=853a05ad35d62b6a1b9d9de59d68f4a035c489be;hpb=c95d4ba97774c6feff8579544c36bf22b5d35976;p=yaz-moved-to-github.git
diff --git a/test/test_ccl.c b/test/test_ccl.c
index 853a05a..5fdb954 100644
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -87,7 +87,8 @@ void tst1(int pass)
ccl_qual_fitem(bibset, "r=o", "x");
ccl_qual_fitem(bibset, "dc.title", "title");
ccl_qual_fitem(bibset, "s=ag", "ag");
- ccl_qual_fitem(bibset, "s=sl", "splitlist");
+ 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");
@@ -120,7 +121,10 @@ void tst1(int pass)
strcpy(tstline, "ag s=ag");
ccl_qual_line(bibset, tstline);
- strcpy(tstline, "splitlist s=sl");
+ 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:
@@ -135,7 +139,8 @@ void tst1(int pass)
"title dc.title\n"
"comb term dc.title\n"
"ag s=ag\n"
- "splitlist s=sl\n"
+ "splitlist s=sl u=2\n"
+ "s2 s=sl u=2 u=3\n"
);
break;
case 3:
@@ -184,6 +189,12 @@ void tst1(int pass)
" \n"
" \n"
" \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
" \n"
"\n";
@@ -271,8 +282,7 @@ void tst1(int pass)
"@prox 0 1 0 2 k 2 "
"@attr 4=2 @attr 1=1016 a "
"@or @attr 4=2 @attr 1=1016 b "
- "@or @attr 4=2 @attr 1=/my/title c "
- "@attr 4=2 @attr 1=1016 c "
+ "@attr 4=2 @attr 1=/my/title c "
));
YAZ_CHECK(tst_ccl_query(bibset, "(a b) % (c)",
@@ -437,14 +447,26 @@ 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", "a "));
+ YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a", "@attr 1=2 a "));
YAZ_CHECK(tst_ccl_query(bibset, "splitlist=a b", "@or "
- "@and a b \"a b\" "));
+ "@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 a b c "
- "@and a \"b c\" "
- "@and \"a b\" c "
- "\"a b c\" "));
+ "@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);
}