X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstccl.c;h=f1ce44025fc08fa249f1c4f7c1dfc209987de37b;hp=32c03290cf1448d5184108b1d7c042190e2dba73;hb=dc0ea3eaeb38d04f10118bfe62cd8e6c80033ce6;hpb=8d691989077a0addcbd840d769dce6700f3d9622 diff --git a/test/tstccl.c b/test/tstccl.c index 32c0329..f1ce440 100644 --- a/test/tstccl.c +++ b/test/tstccl.c @@ -1,14 +1,13 @@ -/* - * 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.12 2007-01-03 08:42:16 adam Exp $ */ /* CCL test */ #include -#include +#include +#include #include @@ -16,19 +15,14 @@ static int tst_ccl_query(CCL_bibset bibset, 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 */ @@ -36,17 +30,25 @@ static int tst_ccl_query(CCL_bibset bibset, 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 + { + 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_free(wrbuf, 1); + wrbuf_destroy(wrbuf); } else { if (result) + { + yaz_log(YLOG_WARN, "%s: parse failed", query); ret = 0; + } else ret = 1; } @@ -68,7 +70,7 @@ void tst1(int pass) { 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"); @@ -77,7 +79,7 @@ void tst1(int pass) 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"); @@ -91,13 +93,55 @@ void tst1(int pass) 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" "x r=o\n" ); break; + case 3: +#if YAZ_HAVE_XML2 + if (1) + { + xmlDocPtr doc; + int r; + const char *addinfo = 0; + const char *xml_str = + "\n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + "\n"; + + doc = xmlParseMemory(xml_str, strlen(xml_str)); + YAZ_CHECK(doc); + + r = ccl_xml_config(bibset, xmlDocGetRootElement(doc), &addinfo); + YAZ_CHECK_EQ(r, 0); + + xmlFreeDoc(doc); + } + break; +#else + return; +#endif default: YAZ_CHECK(0); return; @@ -160,23 +204,48 @@ void tst1(int pass) 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); } int main(int argc, char **argv) { YAZ_CHECK_INIT(argc, argv); + YAZ_CHECK_LOG(); tst1(0); tst1(1); tst1(2); + tst1(3); YAZ_CHECK_TERM; } /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab