X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdump.c;h=935bed197f331be9599ccb9a3eb208b1981596d0;hb=15401488340849487c2d7782121bef66dd19e961;hp=fff06123e87e84ec45032f5fdf1ccdbcdaf25208;hpb=66632b7fb00f84ddc2a00a3a46ac459eb35e052e;p=yaz-moved-to-github.git

diff --git a/util/marcdump.c b/util/marcdump.c
index fff0612..935bed1 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -133,7 +133,7 @@ static void marcdump_read_xml(yaz_marc_t mt, const char *fname)
             {
                 const char *name = (const char *) 
                     xmlTextReaderLocalName(reader);
-                if (!strcmp(name, "record"))
+                if (!strcmp(name, "record") || !strcmp(name, "r"))
                 {
                     xmlNodePtr ptr = xmlTextReaderExpand(reader);
         
@@ -143,8 +143,8 @@ static void marcdump_read_xml(yaz_marc_t mt, const char *fname)
                     else
                     {
                         int write_rc = yaz_marc_write_mode(mt, wrbuf);
-						if (write_rc)
-							yaz_log(YLOG_WARN, "yaz_marc_write_mode: write error: %d", write_rc);
+                        if (write_rc)
+                            yaz_log(YLOG_WARN, "yaz_marc_write_mode: write error: %d", write_rc);
                         
                         fputs(wrbuf_cstr(wrbuf), stdout);
                         wrbuf_rewind(wrbuf);
@@ -167,7 +167,8 @@ static void marcdump_read_xml(yaz_marc_t mt, const char *fname)
                     ptr = ptr->children;
                     continue;
                 }
-                if (!strcmp((const char *) ptr->name, "record"))
+                if (!strcmp((const char *) ptr->name, "record") ||
+                    !strcmp((const char *) ptr->name, "r"))
                 {
                     int r = yaz_marc_read_xml(mt, ptr);
                     if (r)
@@ -217,13 +218,12 @@ static void dump(const char *fname, const char *from, const char *to,
         }
         yaz_marc_iconv(mt, cd);
     }
-    yaz_marc_xml(mt, output_format);
     yaz_marc_enable_collection(mt);
+    yaz_marc_xml(mt, output_format);
     yaz_marc_write_using_libxml2(mt, write_using_libxml2);
-    yaz_marc_write_turbo_format(mt, output_format == YAZ_MARC_TMARCXML);
     yaz_marc_debug(mt, verbose);
 
-    if (input_format == YAZ_MARC_MARCXML || input_format == YAZ_MARC_XCHANGE)
+    if (input_format == YAZ_MARC_MARCXML || input_format == YAZ_MARC_TMARCXML || input_format == YAZ_MARC_XCHANGE)
     {
 #if YAZ_HAVE_XML2
         marcdump_read_xml(mt, fname);