-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
- *
- * $Id: tstccl.c,v 1.15 2007-03-19 22:17:41 adam Exp $
*/
/* CCL test */
#include <string.h>
#include <yaz/ccl_xml.h>
+#include <yaz/log.h>
#include <yaz/test.h>
const char *query,
const char *result)
{
- CCL_parser parser = ccl_parser_create();
+ CCL_parser parser = ccl_parser_create(bibset);
int ret = 0;
if (parser && bibset)
{
- struct ccl_token *token_list;
struct ccl_rpn_node *rpn;
- parser->bibset = bibset;
-
- token_list = ccl_parser_tokenize(parser, query);
- rpn = ccl_parser_find(parser, token_list);
- ccl_token_del(token_list);
+ rpn = ccl_parser_find_str(parser, query);
if (rpn)
{
/* parse ok. check that result is there and match */
if (result && !strcmp(wrbuf_cstr(wrbuf), result))
ret = 1;
else
+ {
+ yaz_log(YLOG_WARN, "%s: result does not match", query);
+ yaz_log(YLOG_WARN, " expected %s", result);
+ yaz_log(YLOG_WARN, " got %s", wrbuf_cstr(wrbuf));
ret = 0;
+ }
ccl_rpn_delete(rpn);
wrbuf_destroy(wrbuf);
}
else
{
if (result)
+ {
+ yaz_log(YLOG_WARN, "%s: parse failed", query);
ret = 0;
+ }
else
ret = 1;
}
{
case 0:
ccl_qual_fitem(bibset, "u=4 s=pw t=l,r", "ti");
- ccl_qual_fitem(bibset, "1=1016 s=al,pw", "term");
+ ccl_qual_fitem(bibset, "1=1016 s=al,pw t=r", "term");
ccl_qual_fitem(bibset, "1=/my/title", "dc.title");
ccl_qual_fitem(bibset, "r=r", "date");
ccl_qual_fitem(bibset, "r=o", "x");
strcpy(tstline, "ti u=4 s=pw t=l,r");
ccl_qual_line(bibset, tstline);
- strcpy(tstline, "term 1=1016 s=al,pw # default term");
+ strcpy(tstline, "term 1=1016 s=al,pw t=r # default term");
ccl_qual_line(bibset, tstline);
strcpy(tstline, "dc.title 1=/my/title");
break;
case 2:
ccl_qual_buf(bibset, "ti u=4 s=pw t=l,r\n"
- "term 1=1016 s=al,pw\r\n"
+ "term 1=1016 s=al,pw t=r\r\n"
"\n"
"dc.title 1=/my/title\n"
"date r=r\n"
" <qual name=\"term\">\n"
" <attr type=\"1\" value=\"1016\"/>\n"
" <attr type=\"s\" value=\"al,pw\"/>\n"
+ " <attr type=\"t\" value=\"r\"/>\n"
" </qual>\n"
" <qual name=\"dc.title\">\n"
" <attr type=\"1\" value=\"/my/title\"/>\n"
r = ccl_xml_config(bibset, xmlDocGetRootElement(doc), &addinfo);
YAZ_CHECK_EQ(r, 0);
+
+ xmlFreeDoc(doc);
}
break;
#else
YAZ_CHECK(tst_ccl_query(bibset, "x=234-1990", "@attr 2=3 234-1990 "));
YAZ_CHECK(tst_ccl_query(bibset, "x=234 - 1990", "@and @attr 2=4 234 @attr 2=2 1990 "));
YAZ_CHECK(tst_ccl_query(bibset, "ti=a,b", "@attr 4=1 @attr 1=4 a,b "));
- YAZ_CHECK(tst_ccl_query(bibset, "ti=a, b", "@attr 4=1 @attr 1=4 a,\\ b "));
+ YAZ_CHECK(tst_ccl_query(bibset, "ti=a, b", "@attr 4=1 @attr 1=4 \"a, b\" "));
YAZ_CHECK(tst_ccl_query(bibset, "ti=a-b", "@attr 4=2 @attr 1=4 a-b "));
- YAZ_CHECK(tst_ccl_query(bibset, "ti=a - b", "@attr 4=1 @attr 1=4 a\\ -\\ b "));
+ YAZ_CHECK(tst_ccl_query(bibset, "ti=a - b", "@attr 4=1 @attr 1=4 \"a - b\" "));
+
+ 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",
+ "@and @attr 4=2 @attr 1=1016 a "
+ "@attr 4=2 @attr 1=1016 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 "));
+
+ /* Bug #2895 */
+#if 1
+ YAZ_CHECK(tst_ccl_query(bibset, "a? b?",
+ /* incorrect. */
+ "@and @attr 4=2 @attr 1=1016 a? "
+ "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
+#else
+ YAZ_CHECK(tst_ccl_query(bibset, "a? b?",
+ /* correct */
+ "@and @attr 5=1 @attr 4=2 @attr 1=1016 a "
+ "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
+#endif
ccl_qual_rm(&bibset);
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab