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
Changed behavior of yaz_retrieval_request so that no rules, i.e. no
[yaz-moved-to-github.git]
/
test
/
tst_retrieval.c
diff --git
a/test/tst_retrieval.c
b/test/tst_retrieval.c
index
cea9da0
..
db10872
100644
(file)
--- a/
test/tst_retrieval.c
+++ b/
test/tst_retrieval.c
@@
-2,13
+2,15
@@
* Copyright (C) 2005-2006, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 2005-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tst_retrieval.c,v 1.3 2006-05-07 14:48:25 adam Exp $
+ * $Id: tst_retrieval.c,v 1.4 2006-05-07 17:45:41 adam Exp $
*
*/
#include <yaz/retrieval.h>
#include <yaz/test.h>
#include <yaz/wrbuf.h>
#include <string.h>
*
*/
#include <yaz/retrieval.h>
#include <yaz/test.h>
#include <yaz/wrbuf.h>
#include <string.h>
+#include <yaz/log.h>
+#include <yaz/libxml2_error.h>
#if HAVE_CONFIG_H
#include <config.h>
#if HAVE_CONFIG_H
#include <config.h>
@@
-117,10
+119,11
@@
static void tst_configure()
" Expected 'retrieval'", 0));
YAZ_CHECK(conv_configure_test("<retrievalinfo><retrieval/>"
" Expected 'retrieval'", 0));
YAZ_CHECK(conv_configure_test("<retrievalinfo><retrieval/>"
- "</retrievalinfo>", 0, 0));
+ "</retrievalinfo>",
+ "Missing 'syntax' attribute", 0));
YAZ_CHECK(conv_configure_test("<retrievalinfo>"
YAZ_CHECK(conv_configure_test("<retrievalinfo>"
- "<retrieval>\n"
+ "<retrieval syntax=\"usmarc\">\n"
" "
"<convert>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
" "
"<convert>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
@@
-136,7
+139,7
@@
static void tst_configure()
0, 0));
YAZ_CHECK(conv_configure_test("<retrievalinfo>"
0, 0));
YAZ_CHECK(conv_configure_test("<retrievalinfo>"
- "<retrieval>"
+ "<retrieval syntax=\"usmarc\">"
"<convert>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
"<convert>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
@@
-147,7
+150,7
@@
static void tst_configure()
"/>"
"</convert>"
"</retrieval>"
"/>"
"</convert>"
"</retrieval>"
- "<retrieval>"
+ "<retrieval syntax=\"usmarc\">"
"<convert>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
"<convert>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
@@
-198,6
+201,9
@@
static void tst_configure()
int main(int argc, char **argv)
{
YAZ_CHECK_INIT(argc, argv);
int main(int argc, char **argv)
{
YAZ_CHECK_INIT(argc, argv);
+
+ libxml2_error_to_yazlog(0 /* disable it */, "");
+
#if HAVE_XSLT
tst_configure();
#endif
#if HAVE_XSLT
tst_configure();
#endif