X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftstxmlquery.c;h=8164d80f08df677e5e5f795d4cd30b3730bf4efa;hp=7ed5477c3b30414d568d880116c10fb9f337b1f9;hb=69c2dee55aa204cab368989b8385eda8b83bf2e2;hpb=6671d1583ced9613ab7f12bfed69fd70fd9e6b15 diff --git a/test/tstxmlquery.c b/test/tstxmlquery.c index 7ed5477..8164d80 100644 --- a/test/tstxmlquery.c +++ b/test/tstxmlquery.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. - * - * $Id: tstxmlquery.c,v 1.9 2006-02-19 18:44:23 adam Exp $ */ #include @@ -14,7 +12,7 @@ #include #include -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include #endif @@ -47,7 +45,7 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml, status = PQF_FAILED; else { -#if HAVE_XML2 +#if YAZ_HAVE_XML2 xmlDocPtr doc = 0; yaz_rpnquery2xml(rpn, &doc); @@ -78,14 +76,14 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml, { WRBUF w = wrbuf_alloc(); yaz_query_to_wrbuf(w, query2); - if (!expect_pqf || strcmp(expect_pqf, wrbuf_buf(w)) == 0) + if (!expect_pqf || strcmp(expect_pqf, wrbuf_cstr(w)) == 0) status = XML_MATCH; else { status = XML_NO_MATCH; - printf("Result: %s\n", wrbuf_buf(w)); + printf("Result: %s\n", wrbuf_cstr(w)); } - wrbuf_free(w, 1); + wrbuf_destroy(w); } odr_destroy(odr2); } @@ -95,6 +93,7 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml, status = XML_NO_MATCH; } xmlFreeDoc(doc); + xmlFree(buf_out); } #else status = QUERY2XML_FAILED; @@ -104,72 +103,72 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml, return status; } -static void tst() +static void tst(void) { YAZ_CHECK_EQ(pqf2xml_text("@attr 1=4 bad query", "", 0), PQF_FAILED); -#if HAVE_XML2 +#if YAZ_HAVE_XML2 YAZ_CHECK_EQ(pqf2xml_text( "@attr 1=4 computer", "\n" - "" + "" "" "computer" - "\n", - "RPN: @attrset Bib-1 @attr 1=4 computer" + "\n", + "RPN @attrset Bib-1 @attr 1=4 computer" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@attr 2=1 @attr 1=title computer", "\n" - "" + "" "" "" "computer" - "\n", - "RPN: @attrset Bib-1 @attr \"1=title\" @attr 2=1 computer" + "\n", + "RPN @attrset Bib-1 @attr \"1=title\" @attr 2=1 computer" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@attr 2=1 @attr exp1 1=1 computer", "\n" - "" + "" "" "" "computer" - "\n", - "RPN: @attrset Bib-1 @attr Exp-1 1=1 @attr 2=1 computer" + "\n", + "RPN @attrset Bib-1 @attr Exp-1 1=1 @attr 2=1 computer" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@and a b", "\n" - "" - "" + "" + "" "a" "b" - "\n", - "RPN: @attrset Bib-1 @and a b" + "\n", + "RPN @attrset Bib-1 @and a b" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@or @and a b c", "\n" - "" - "" - "" + "" + "" + "" "a" - "b" + "b" "c" - "\n", - "RPN: @attrset Bib-1 @or @and a b c" + "\n", + "RPN @attrset Bib-1 @or @and a b c" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@set abe", "\n" - "" - "abe\n", - "RPN: @attrset Bib-1 @set abe" + "" + "abe\n", + "RPN @attrset Bib-1 @set abe" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( @@ -177,57 +176,57 @@ static void tst() knownunit, proxunit */ "@prox 0 3 1 2 k 2 a b", "\n" - "" - "" + "" "a" "b" - "\n", - "RPN: @attrset Bib-1 @prox 0 3 1 2 k 2 a b" + "\n", + "RPN @attrset Bib-1 @prox 0 3 1 2 k 2 a b" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@term numeric 32", "\n" - "" + "" "" "32" - "\n", - "RPN: @attrset Bib-1 @term numeric 32" + "\n", + "RPN @attrset Bib-1 @term numeric 32" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@term string computer", "\n" - "" + "" "" "computer" - "\n", - "RPN: @attrset Bib-1 @term string computer" + "\n", + "RPN @attrset Bib-1 @term string computer" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@term null void", "\n" - "" + "" "" "" - "\n", - "RPN: @attrset Bib-1 @term null x" + "\n", + "RPN @attrset Bib-1 @term null x" ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( "@attrset gils @attr 4=2 x", "\n" - "" + "" "" "" "x" - "\n", - "RPN: @attrset GILS @attr 4=2 x" + "\n", + "RPN @attrset GILS @attr 4=2 x" ), XML_MATCH); #endif } @@ -242,6 +241,7 @@ int main (int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab