X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_ccl.c;h=2c1e608de35ae443f6b9aa4faa24aeaab19701fd;hb=4f3f16d519137001a916178e28ad1dff8b986a7d;hp=fc244b6036da75a1d5a8654401c521ca9f9da31d;hpb=b1df5f9013d82510f6250d93623a0126ec19265f;p=yaz-moved-to-github.git
diff --git a/test/test_ccl.c b/test/test_ccl.c
index fc244b6..2c1e608 100644
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -87,6 +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 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");
@@ -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"
@@ -131,6 +139,8 @@ void tst1(int pass)
"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:
@@ -177,6 +187,15 @@ void tst1(int pass)
" \n"
" \n"
" \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
"\n";
doc = xmlParseMemory(xml_str, strlen(xml_str));
@@ -263,12 +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 "
-#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
+ "@attr 4=2 @attr 1=/my/title c "
));
YAZ_CHECK(tst_ccl_query(bibset, "(a b) % (c)",
@@ -432,6 +446,35 @@ 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));
+
ccl_qual_rm(&bibset);
}