X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fmarcdump.c;h=0696df83fbccd66cdb64859d14004cdcbe6d061e;hp=9ed9d1c024fbc860f3300fb6b6121d6cfdfd20e1;hb=df84e4897abc4565fe11adead30b99d9634b41b1;hpb=6835889492d68a285d59cfb1a156517a34937130

diff --git a/util/marcdump.c b/util/marcdump.c
index 9ed9d1c..0696df8 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -219,12 +219,11 @@ static void dump(const char *fname, const char *from, const char *to,
         yaz_marc_iconv(mt, cd);
     }
     yaz_marc_enable_collection(mt);
-    yaz_marc_set_read_format(mt, input_format);
-    yaz_marc_set_write_format(mt, output_format);
+    yaz_marc_xml(mt, output_format);
     yaz_marc_write_using_libxml2(mt, write_using_libxml2);
     yaz_marc_debug(mt, verbose);
 
-    if (input_format == YAZ_MARC_MARCXML || input_format == YAZ_MARC_TMARCXML || input_format == YAZ_MARC_XCHANGE)
+    if (input_format == YAZ_MARC_MARCXML || input_format == YAZ_MARC_TURBOMARC || input_format == YAZ_MARC_XCHANGE)
     {
 #if YAZ_HAVE_XML2
         marcdump_read_xml(mt, fname);
@@ -444,8 +443,14 @@ int main (int argc, char **argv)
                rather than WRBUF */
             if (strlen(arg) > 4 && strncmp(arg, "xml,", 4) == 0)
             {
+                /* Only supported for Libxml2 2.6.0 or later */
+#if LIBXML_VERSION >= 20600
                 arg = arg + 4;
                 write_using_libxml2 = 1;
+#else
+                fprintf(stderr, "%s: output using Libxml2 unsupported\n", prog);
+                exit(4);
+#endif
             }
             output_format = yaz_marc_decode_formatstr(arg);
             if (output_format == -1)