X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_xmlquery.c;h=513311befaab1a2e15073bc5c0c6efc283b10881;hp=908adc680b81fad428273677439e3c595810dbc8;hb=800e0637cfe783fa9966e11712b7e20023ba2245;hpb=2b4785b39a2bbb4affd77fb9e24aaabc0b2dd069 diff --git a/test/test_xmlquery.c b/test/test_xmlquery.c index 908adc6..513311b 100644 --- a/test/test_xmlquery.c +++ b/test/test_xmlquery.c @@ -1,7 +1,10 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -49,7 +52,7 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml, xmlDocPtr doc = 0; yaz_rpnquery2xml(rpn, &doc); - + if (!doc) status = QUERY2XML_FAILED; else @@ -58,7 +61,7 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml, int len_out; xmlDocDumpMemory(doc, (xmlChar **) &buf_out, &len_out); - + if (len_out == (int) strlen(expect_xml) && memcmp(buf_out, expect_xml, len_out) == 0) { @@ -67,7 +70,7 @@ enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml, const char *addinfo = 0; const xmlNode *root_element = xmlDocGetRootElement(doc); ODR odr2 = odr_createmem(ODR_ENCODE); - + yaz_xml2query(root_element, &query2, odr2, &error_code, &addinfo); if (error_code || !query2) @@ -108,7 +111,7 @@ static void tst(void) YAZ_CHECK_EQ(pqf2xml_text("@attr 1=4 bad query", "", 0), PQF_FAILED); #if YAZ_HAVE_XML2 YAZ_CHECK_EQ(pqf2xml_text( - "@attr 1=4 computer", + "@attr 1=4 computer", "\n" "" "" @@ -116,7 +119,7 @@ static void tst(void) "\n", "RPN @attrset Bib-1 @attr 1=4 computer" ), XML_MATCH); - + YAZ_CHECK_EQ(pqf2xml_text( "@attr 2=1 @attr 1=title computer", "\n" @@ -138,9 +141,9 @@ static void tst(void) "\n", "RPN @attrset Bib-1 @attr Exp-1 1=1 @attr 2=1 computer" ), XML_MATCH); - + YAZ_CHECK_EQ(pqf2xml_text( - "@and a b", + "@and a b", "\n" "" "" @@ -149,9 +152,9 @@ static void tst(void) "\n", "RPN @attrset Bib-1 @and a b" ), XML_MATCH); - + YAZ_CHECK_EQ(pqf2xml_text( - "@or @and a b c", + "@or @and a b c", "\n" "" "" @@ -164,7 +167,7 @@ static void tst(void) ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( - "@set abe", + "@set abe", "\n" "" "abe\n", @@ -172,9 +175,9 @@ static void tst(void) ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( - /* exclusion, distance, ordered, relationtype, + /* exclusion, distance, ordered, relationtype, knownunit, proxunit */ - "@prox 0 3 1 2 k 2 a b", + "@prox 0 3 1 2 k 2 a b", "\n" "" "\n" "" "" @@ -197,9 +200,9 @@ static void tst(void) "\n", "RPN @attrset Bib-1 @term numeric 32" ), XML_MATCH); - + YAZ_CHECK_EQ(pqf2xml_text( - "@term string computer", + "@term string computer", "\n" "" "" @@ -207,9 +210,9 @@ static void tst(void) "\n", "RPN @attrset Bib-1 @term string computer" ), XML_MATCH); - + YAZ_CHECK_EQ(pqf2xml_text( - "@term null void", + "@term null void", "\n" "" "" @@ -219,7 +222,7 @@ static void tst(void) ), XML_MATCH); YAZ_CHECK_EQ(pqf2xml_text( - "@attrset gils @attr 4=2 x", + "@attrset gils @attr 4=2 x", "\n" "" ""