X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftst_retrieval.c;h=7a2561bd1e78f302c747115718da1b0436b999e6;hb=67471e87c134f2503546cdd250cd169b7d43d566;hp=7482535ad915ab25bdb405edb67cca674dfe1ae5;hpb=76b209145568a179bb21a8d43db003ffe605b6d5;p=yaz-moved-to-github.git

diff --git a/test/tst_retrieval.c b/test/tst_retrieval.c
index 7482535..7a2561b 100644
--- a/test/tst_retrieval.c
+++ b/test/tst_retrieval.c
@@ -2,19 +2,21 @@
  * Copyright (C) 2005-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tst_retrieval.c,v 1.1 2006-05-04 20:00:45 adam Exp $
+ * $Id: tst_retrieval.c,v 1.7 2006-10-04 16:59:34 mike Exp $
  *
  */
 #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>
 #endif
 
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -102,24 +104,54 @@ int conv_configure_test(const char *xmlstring, const char *expect_error,
     return ret;
 }
 
-static void tst_configure()
+static void tst_configure(void)
 {
-    YAZ_CHECK(conv_configure_test("<bad", "xmlParseMemory", 0));
-#if 0
-    YAZ_CHECK(conv_configure_test("<bad/>", "Missing 'convert' element", 0));
-    YAZ_CHECK(conv_configure_test("<convert/>", 0, 0));
-    YAZ_CHECK(conv_configure_test("<convert><bad/></convert>",
+    YAZ_CHECK(conv_configure_test("<bad", 
+                                  "xmlParseMemory", 0));
+
+    YAZ_CHECK(conv_configure_test("<bad/>", 
+                                  "Missing 'retrievalinfo' element", 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo/>", 0, 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo><bad/></retrievalinfo>",
                                   "Bad element 'bad'."
-                                  "Expected marc, xslt, ..", 0));
-    YAZ_CHECK(conv_configure_test("<convert>"
+                                  " Expected 'retrieval'", 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo><retrieval/>"
+                                  "</retrievalinfo>", 
+                                  "Missing 'syntax' attribute", 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval syntax=\"usmarc\">\n"
+                                  "  "
+                                  "<convert>"
                                   "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
                                   "<marc"
-                                  " inputcharset=\"marc-8\""
+                                  " inputcharset=\"utf-8\""
+                                  " outputcharset=\"marc-8\""
+                                  " inputformat=\"xml\""
+                                  " outputformat=\"marc\""
+                                  "/>"
+                                  "</convert>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
+                                  0, 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval syntax=\"usmarc\">"
+                                  "<convert>"
+                                  "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
+                                  "<marc"
+                                  " inputcharset=\"utf-8\""
                                   " outputcharset=\"marc-8\""
+                                  " inputformat=\"xml\""
+                                  " outputformat=\"marc\""
                                   "/>"
-                                  "</convert>",
-                                  "Attribute 'inputformat' required", 0));
-    YAZ_CHECK(conv_configure_test("<convert>"
+                                  "</convert>"
+                                  "</retrieval>"
+                                  "<retrieval syntax=\"usmarc\">"
+                                  "<convert>"
                                   "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
                                   "<marc"
                                   " inputcharset=\"utf-8\""
@@ -127,9 +159,70 @@ static void tst_configure()
                                   " inputformat=\"xml\""
                                   " outputformat=\"marc\""
                                   "/>"
-                                  "</convert>",
+                                  "</convert>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
                                   0, 0));
-#endif
+
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval" 
+                                  " syntax=\"usmarc\""
+                                  " name=\"marcxml\"" 
+                                  " identifier=\"info:srw/schema/1/marcxml-v1.1\""
+                                  ">"
+                                  "<convert/>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
+                                  0, 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval" 
+                                  " syntax=\"usmarc\""
+                                  " name=\"marcxml\""
+                                  " backendsyntax=\"usmarc\""
+                                  " backendname=\"marcxml\""
+                                  " identifier=\"info:srw/schema/1/marcxml-v1.1\""
+                                  ">"
+                                  "<convert/>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
+                                  0, 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval" 
+                                  " syntax=\"usmarc\""
+                                  " name=\"marcxml\""
+                                  " backendsyntax=\"usmarc\""
+                                  " backendschema=\"marcxml\""
+                                  " identifier=\"info:srw/schema/1/marcxml-v1.1\""
+                                  ">"
+                                  "<convert/>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
+                                  "Bad attribute 'backendschema'."
+                                  " Use 'backendname' instead", 
+                                  0));
+
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval" 
+                                  " syntax=\"unknown_synt\""
+                                  ">"
+                                  "<convert/>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
+                                  "Bad syntax 'unknown_synt'", 0));
+
+    YAZ_CHECK(conv_configure_test("<retrievalinfo>"
+                                  "<retrieval" 
+                                  " backendsyntax=\"unknown_synt\""
+                                  ">"
+                                  "<convert/>"
+                                  "</retrieval>"
+                                  "</retrievalinfo>",
+                                  "Bad backendsyntax 'unknown_synt'", 0));
+
 }
 
 #endif
@@ -137,7 +230,10 @@ static void tst_configure()
 int main(int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
-#if HAVE_XSLT
+
+    libxml2_error_to_yazlog(0 /* disable it */, "");
+
+#if YAZ_HAVE_XSLT
     tst_configure();
 #endif
     YAZ_CHECK_TERM;