X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxslt%2Fxslt5.c;h=932f9cf65e5087db4ec5063bff9dcaa2d53945fe;hb=0dedb6a7a6a0f0ddaf56cb0673978fdd85e64be1;hp=2d041c9004b36865d3840b6a2608230185978816;hpb=58b1837132acdc0f4683fef187b6a5b06534fa85;p=idzebra-moved-to-github.git

diff --git a/test/xslt/xslt5.c b/test/xslt/xslt5.c
index 2d041c9..932f9cf 100644
--- a/test/xslt/xslt5.c
+++ b/test/xslt/xslt5.c
@@ -1,8 +1,5 @@
-/* $Id: xslt5.c,v 1.1 2006-11-10 13:10:31 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -20,9 +17,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include "testlib.h"
 
+#if YAZ_HAVE_XML2
+#include <libxml/xmlversion.h>
+#endif
+
 static void tst(int argc, char **argv)
 {
     char path[256];
@@ -36,11 +40,11 @@ static void tst(int argc, char **argv)
 
     tl_check_filter(zs, "alvis");
 
-    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
-    
+    YAZ_CHECK_EQ(zebra_select_database(zh, "Default"), ZEBRA_OK);
+
     zebra_init(zh);
 
-    sprintf(profile_path, "%s:%s/../../tab", 
+    sprintf(profile_path, "%s:%s/../../tab",
             tl_get_srcdir(), tl_get_srcdir());
     zebra_set_resource(zh, "profilePath", profile_path);
 
@@ -52,12 +56,25 @@ static void tst(int argc, char **argv)
     if (f)
     {
         r = fread(record_buf, 1, sizeof(record_buf)-1, f);
+        YAZ_CHECK(r > 0);
         fclose(f);
         YAZ_CHECK(r > 2);
         record_buf[r] = '\0';
-        
+
+#if 0
+/* disable this test for now: bug #730 */
+/* http://xmlsoft.org/html/libxml-parser.html#xmlReadIO */
+#if YAZ_HAVE_XML2
+        /* On Mac OSX using Libxml 2.6.16, we xmlTextReaderExpand does
+           not return 0 ptr even though the record has an error in it */
+#if LIBXML_VERSION >= 20617
         YAZ_CHECK_EQ(zebra_add_record(zh, record_buf, strlen(record_buf)),
                      ZEBRA_FAIL);
+#else
+        zebra_add_record(zh, record_buf, strlen(record_buf));
+#endif
+#endif
+#endif
     }
     YAZ_CHECK(tl_close_down(zh, zs));
 }
@@ -67,6 +84,7 @@ TL_MAIN
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab