X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdump.c;h=076628e706ad9256d70644ac43870dbbd718b62a;hb=366dc7568281c9774cd309b28c24a077604264a0;hp=7cc154ec62ace766fcd34b9bed7b368ca634b151;hpb=aabf1ddf38ac10199480c78045c09456c86524a8;p=yaz-moved-to-github.git

diff --git a/util/marcdump.c b/util/marcdump.c
index 7cc154e..076628e 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,49 +1,9 @@
 /*
- * Copyright (c) 1995-2001, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: marcdump.c,v $
- * Revision 1.13  2001-02-10 01:21:59  adam
- * Dumper only keeps one record at a time in memory.
- *
- * Revision 1.12  2000/10/02 11:07:45  adam
- * Added peer_name member for bend_init handler. Changed the YAZ
- * client so that tcp: can be avoided in target spec.
- *
- * Revision 1.11  2000/07/04 08:53:22  adam
- * Fixed bug.
- *
- * Revision 1.10  2000/02/29 13:44:55  adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.9  1999/11/30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.8  1999/05/26 07:49:35  adam
- * C++ compilation.
- *
- * Revision 1.7  1998/02/11 11:53:36  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.6  1997/12/12 06:32:33  adam
- * Added include of string.h.
- *
- * Revision 1.5  1997/09/24 13:29:40  adam
- * Added verbose option -v to marcdump utility.
- *
- * Revision 1.4  1995/11/01 13:55:05  quinn
- * Minor adjustments
- *
- * Revision 1.3  1995/05/16  08:51:12  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.2  1995/05/15  11:56:56  quinn
- * Debuggng & adjustments.
- *
- * Revision 1.1  1995/04/10  10:28:47  quinn
- * Added copy of CCL and MARC display
- *
+ * $Id: marcdump.c,v 1.18 2002-12-03 10:03:27 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -65,7 +25,13 @@
 #ifndef SEEK_END
 #define SEEK_END 2
 #endif
- 
+
+static void usage(const char *prog)
+{
+    fprintf (stderr, "Usage: %s [-c cfile] [-x] [-O] [-X] [-v] file...\n",
+             prog);
+} 
+
 int main (int argc, char **argv)
 {
     int r;
@@ -75,9 +41,10 @@ int main (int argc, char **argv)
     char buf[100001];
     char *prog = *argv;
     int no = 0;
+    int xml = 0;
     FILE *cfile = 0;
 
-    while ((r = options("vc:", argv, argc, &arg)) != -2)
+    while ((r = options("vc:xOX", argv, argc, &arg)) != -2)
     {
 	int count;
 	no++;
@@ -88,6 +55,15 @@ int main (int argc, char **argv)
 		fclose (cfile);
 	    cfile = fopen (arg, "w");
 	    break;
+        case 'x':
+            xml = YAZ_MARC_XML;
+            break;
+        case 'O':
+            xml = YAZ_MARC_OAIMARC;
+            break;
+        case 'X':
+            xml = YAZ_MARC_MARCXML;
+            break;
         case 0:
 	    inf = fopen (arg, "r");
 	    count = 0;
@@ -101,6 +77,8 @@ int main (int argc, char **argv)
 		fprintf (cfile, "char *marc_records[] = {\n");
 	    while (1)
 	    {
+                WRBUF wr = wrbuf_alloc();
+
 		int len;
 		
 		r = fread (buf, 1, 5, inf);
@@ -113,16 +91,17 @@ int main (int argc, char **argv)
 		r = fread (buf + 5, 1, len, inf);
 		if (r < len)
 		    break;
-		r = marc_display_ex (buf, stdout, verbose);
+                r = yaz_marc_decode (buf, wr, verbose, -1, xml);
 		if (r <= 0)
 		    break;
+                fwrite (wrbuf_buf(wr), wrbuf_len(wr), 1, stdout);
 		if (cfile)
 		{
 		    char *p = buf;
 		    int i;
 		    if (count)
 			fprintf (cfile, ",");
-		    fprintf (cfile, "{\n");
+		    fprintf (cfile, "\n");
 		    for (i = 0; i < r; i++)
 		    {
 			if ((i & 15) == 0)
@@ -133,7 +112,7 @@ int main (int argc, char **argv)
 			    fprintf (cfile, "\"\n");
 			
 			}
-		    fprintf (cfile, "\"\n}");
+		    fprintf (cfile, "\"\n");
 		}
 		count++;
 	    }
@@ -144,7 +123,7 @@ int main (int argc, char **argv)
 	    verbose++;
             break;
         default:
-            fprintf (stderr, "Usage: %s [-c cfile] [-v] file...\n", prog);
+            usage(prog);
             exit (1);
         }
     }
@@ -152,7 +131,7 @@ int main (int argc, char **argv)
 	fclose (cfile);
     if (!no)
     {
-	fprintf (stderr, "Usage: %s [-v] file...\n", prog);
+        usage(prog);
 	exit (1);
     }
     exit (0);