+ YAZ_CHECK(tst_ccl_query(bibset, "ag=a b",
+ "@attr 4=2 \"a b\" "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "ag=a b \"c d\"",
+ "@and @attr 4=2 \"a b\" @attr 4=1 \"c d\" "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "ag=a b \"c\"",
+ "@attr 4=2 \"a b c\" "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "ag=a b \"\"",
+ "@attr 4=2 \"a b \" "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "ag=a \"b c\" d",
+ "@and @and "
+ "@attr 4=2 a @attr 4=1 \"b c\" @attr 4=2 d "));
+
+ 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);
+}
+
+void tst2(void)
+{
+ CCL_bibset bibset = ccl_qual_mk();
+
+ YAZ_CHECK(bibset);
+ if (!bibset)
+ return;
+
+ 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 b?#",
+ "@and @attr 4=2 @attr 1=1016 a @attr 5=104 @attr 4=2 @attr 1=1016 b?# "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "a*",
+ "@attr 4=2 @attr 1=1016 a* "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "a?",
+ "@attr 5=104 @attr 4=2 @attr 1=1016 a? "));
+
+ ccl_qual_fitem(bibset, "*", "@truncation");
+ 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? "));
+
+ 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 4=2 @attr 1=1016 a?# "));
+
+ ccl_qual_fitem(bibset, "og", "@and");
+ ccl_qual_fitem(bibset, "eller", "@or");
+ ccl_qual_fitem(bibset, "ikke", "@not");
+
+ YAZ_CHECK(tst_ccl_query(bibset, "a og b eller c ikke d",
+ "@not @or @and @attr 4=2 @attr 1=1016 a "
+ "@attr 4=2 @attr 1=1016 b "
+ "@attr 4=2 @attr 1=1016 c "
+ "@attr 4=2 @attr 1=1016 d "));
+ ccl_qual_rm(&bibset);
+}
+
+
+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);