projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Working in progress: refactor the xml_write to handle two formats
[yaz-moved-to-github.git]
/
test
/
tstxmlquery.c
diff --git
a/test/tstxmlquery.c
b/test/tstxmlquery.c
index
e0c7999
..
c1e9034
100644
(file)
--- a/
test/tstxmlquery.c
+++ b/
test/tstxmlquery.c
@@
-1,8
+1,6
@@
-/*
- * 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.
* See the file LICENSE for details.
- *
- * $Id: tstxmlquery.c,v 1.15 2007-03-19 14:40:07 adam Exp $
*/
#include <stdlib.h>
*/
#include <stdlib.h>
@@
-61,7
+59,7
@@
enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml,
xmlDocDumpMemory(doc, (xmlChar **) &buf_out, &len_out);
xmlDocDumpMemory(doc, (xmlChar **) &buf_out, &len_out);
- if (len_out == strlen(expect_xml)
+ if (len_out == (int) strlen(expect_xml)
&& memcmp(buf_out, expect_xml, len_out) == 0)
{
Z_Query *query2 = 0;
&& memcmp(buf_out, expect_xml, len_out) == 0)
{
Z_Query *query2 = 0;
@@
-83,7
+81,7
@@
enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml,
else
{
status = XML_NO_MATCH;
else
{
status = XML_NO_MATCH;
- printf("Result: %s\n", wrbuf_buf(w));
+ printf("Result: %s\n", wrbuf_cstr(w));
}
wrbuf_destroy(w);
}
}
wrbuf_destroy(w);
}
@@
-95,6
+93,7
@@
enum pqf2xml_status pqf2xml_text(const char *pqf, const char *expect_xml,
status = XML_NO_MATCH;
}
xmlFreeDoc(doc);
status = XML_NO_MATCH;
}
xmlFreeDoc(doc);
+ xmlFree(buf_out);
}
#else
status = QUERY2XML_FAILED;
}
#else
status = QUERY2XML_FAILED;
@@
-242,6
+241,7
@@
int main (int argc, char **argv)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab