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");
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"
"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:
" <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));
"@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)",
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 @or "
- "@and @and @attr 1=2 a @attr 1=2 b @attr 1=2 c "
- "@and @attr 1=2 a @attr 1=2 \"b c\" "
+
+ 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);
}