Fixed compilation and tests for case where Libxml2 is unavailable.

[yaz-moved-to-github.git] / src / marcdisp.c

diff --git a/src/marcdisp.c b/src/marcdisp.c
index 02f3d3e..9037b5b 100644 (file)
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: marcdisp.c,v 1.44 2007-01-18 14:45:05 adam Exp $
+ * $Id: marcdisp.c,v 1.46 2007-02-17 10:53:05 adam Exp $
  */
 
 /**
@@ -129,20 +129,12 @@ static void marc_iconv_reset(yaz_marc_t mt, WRBUF wr)
 {
     if (mt->iconv_cd)
     {
-#if 1
         char outbuf[12];
         size_t outbytesleft = sizeof(outbuf);
         char *outp = outbuf;
         size_t r = yaz_iconv(mt->iconv_cd, 0, 0, &outp, &outbytesleft);
         if (r != (size_t) (-1))
             wrbuf_write(wr, outbuf, outp - outbuf);
-#else
-        int pos = wr->pos;
-        wrbuf_iconv_puts(wr, mt->iconv_cd, " ");
-        if (pos != wr->pos)
-            wr->pos--;
-        yaz_iconv(mt->iconv_cd, 0, 0, 0, 0);
-#endif
     }
 }
 
@@ -651,6 +643,7 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr,
 {
     if (mt->write_using_libxml2)
     {
+#if YAZ_HAVE_XML2
         int ret;
         xmlNode *root_ptr;
 
@@ -670,6 +663,9 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr,
             xmlFreeDoc(doc);
         }
         return ret;
+#else
+        return -1;
+#endif
     }
     else
         return yaz_marc_write_marcxml_ns1(mt, wr, ns, format, type);