-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
- *
- * $Id: tstccl.c,v 1.13 2007-01-08 10:48:07 adam Exp $
*/
/* CCL test */
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 */
ccl_pquery(wrbuf, rpn);
/* check expect a result and that it matches */
- if (result && !strcmp(wrbuf_buf(wrbuf), result))
+ if (result && !strcmp(wrbuf_cstr(wrbuf), result))
ret = 1;
else
ret = 0;
ccl_rpn_delete(rpn);
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
}
else
{
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\" "));
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