X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fmarcdump.c;h=edacc07426a9488f17ca0ea80a061121fcb60c0a;hp=ed2096aa838fb881ea0d9e6c5a27da208e9e9358;hb=eb7eb1c9a8e4979c5a783393be7b74fd92a04c54;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0

diff --git a/util/marcdump.c b/util/marcdump.c
index ed2096a..edacc07 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 
@@ -58,12 +58,23 @@ static char *prog;
 
 static void usage(const char *prog)
 {
-    fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] "
-             "[-i format] [-o format] "
-             "[-n] [-l pos=value] [-v] [-C chunk] [-s splitfname] [-p] file...\n",
+    fprintf (stderr, "Usage: %s [-i format] [-o format] [-f from] [-t to] "
+             "[-l pos=value] [-c cfile] [-s prefix] [-C size] [-n] "
+             "[-p] [-v] [-V] file...\n",
              prog);
 } 
 
+static void show_version(void)
+{
+    char vstr[20], sha1_str[41];
+
+    yaz_version(vstr, sha1_str);
+    printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1);
+    if (strcmp(sha1_str, YAZ_VERSION_SHA1))
+        printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str);
+    exit(0);
+}
+
 static int getbyte_stream(void *client_data)
 {
     FILE *f = (FILE*) client_data;
@@ -122,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);
         
@@ -131,7 +142,9 @@ static void marcdump_read_xml(yaz_marc_t mt, const char *fname)
                         fprintf(stderr, "yaz_marc_read_xml failed\n");
                     else
                     {
-                        yaz_marc_write_mode(mt, wrbuf);
+                        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);
                         
                         fputs(wrbuf_cstr(wrbuf), stdout);
                         wrbuf_rewind(wrbuf);
@@ -154,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)
@@ -204,12 +218,13 @@ 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_set_read_format(mt, input_format);
+    yaz_marc_set_write_format(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_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);
@@ -330,9 +345,13 @@ static void dump(const char *fname, const char *from, const char *to,
             }
             len_result = rlen;
             r = yaz_marc_decode_buf(mt, buf, -1, &result, &len_result);
-            if (r > 0 && result)
+            if (r > 0 && result && len_result)
             {
-                fwrite (result, len_result, 1, stdout);
+                if (fwrite(result, len_result, 1, stdout) != 1)
+                {
+                    fprintf(stderr, "Write to stdout failed\n");
+                    break;
+                }
             }
             if (r > 0 && cfile)
             {
@@ -398,7 +417,7 @@ int main (int argc, char **argv)
 #endif
 
     prog = *argv;
-    while ((r = options("i:o:C:npvc:xOeXIf:t:s:l:", argv, argc, &arg)) != -2)
+    while ((r = options("i:o:C:npc:xOeXIf:t:s:l:Vv", argv, argc, &arg)) != -2)
     {
         no++;
         switch (r)
@@ -495,6 +514,9 @@ int main (int argc, char **argv)
         case 'v':
             verbose++;
             break;
+        case 'V': 
+            show_version();
+            break;
         default:
             usage(prog);
             exit(1);
@@ -512,6 +534,7 @@ int main (int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab