Various clean ups of tmarcxml

[yaz-moved-to-github.git] / util / marcdump.c

diff --git a/util/marcdump.c b/util/marcdump.c
index d94250a..935bed1 100644 (file)
--- 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)
@@ -218,8 +219,7 @@ 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);