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

diff --git a/util/marcdump.c b/util/marcdump.c
index b28a838..076628e 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,43 +1,21 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: marcdump.c,v $
- * 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
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <yaz/marcdisp.h>
+#include <yaz/yaz-util.h>
 #include <yaz/xmalloc.h>
 #include <yaz/options.h>
 
@@ -47,77 +25,113 @@
 #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 ret;
+    int r;
     char *arg;
     int verbose = 0;
     FILE *inf;
-    long file_size;
-    char *buf;
+    char buf[100001];
     char *prog = *argv;
-    int count = 0;
     int no = 0;
+    int xml = 0;
+    FILE *cfile = 0;
 
-    while ((ret = options("v", argv, argc, &arg)) != -2)
+    while ((r = options("vc:xOX", argv, argc, &arg)) != -2)
     {
+	int count;
 	no++;
-        switch (ret)
+        switch (r)
         {
+	case 'c':
+	    if (cfile)
+		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;
 	    if (!inf)
 	    {
 		fprintf (stderr, "%s: cannot open %s:%s\n",
 			 prog, arg, strerror (errno));
 		exit (1);
 	    }
-	    if (fseek (inf, 0L, SEEK_END))
+	    if (cfile)
+		fprintf (cfile, "char *marc_records[] = {\n");
+	    while (1)
 	    {
-		fprintf (stderr, "%s: cannot seek in %s:%s\n",
-			 prog, arg, strerror (errno));
-		exit (1);
-	    }
-	    file_size = ftell (inf);    
-	    if (fseek (inf, 0L, SEEK_SET))
-	    {
-		fprintf (stderr, "%s: cannot seek in %s:%s\n",
-			 prog, arg, strerror (errno));
-		exit (1);
-	    }
-	    buf = (char *)xmalloc (file_size);
-	    if (!buf)
-	    {
-		fprintf (stderr, "%s: cannot xmalloc: %s\n",
-			 prog, strerror (errno));
-		exit (1);
-	    }
-	    if ((long) fread (buf, 1, file_size, inf) != file_size)
-	    {
-		fprintf (stderr, "%s: cannot read %s: %s\n",
-			 prog, arg, strerror (errno));
-		exit (1);
-	    }
-	    while ((ret = marc_display_ex (buf, stdout, verbose)) > 0)
-	    {
-		buf += ret;
+                WRBUF wr = wrbuf_alloc();
+
+		int len;
+		
+		r = fread (buf, 1, 5, inf);
+		if (r < 5)
+		    break;
+		len = atoi_n(buf, 5);
+		if (len < 25 || len > 100000)
+		    break;
+		len = len - 5;
+		r = fread (buf + 5, 1, len, inf);
+		if (r < len)
+		    break;
+                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");
+		    for (i = 0; i < r; i++)
+		    {
+			if ((i & 15) == 0)
+			    fprintf (cfile, "  \"");
+			fprintf (cfile, "\\x%02X", p[i] & 255);
+			
+			if (i < r - 1 && (i & 15) == 15)
+			    fprintf (cfile, "\"\n");
+			
+			}
+		    fprintf (cfile, "\"\n");
+		}
 		count++;
 	    }
-	    fclose (inf);
-	    xfree (buf);
+	    if (cfile)
+		fprintf (cfile, "};\n");
             break;
         case 'v':
 	    verbose++;
             break;
         default:
-            fprintf (stderr, "Usage: %s [-v] file...\n", prog);
+            usage(prog);
             exit (1);
         }
     }
+    if (cfile)
+	fclose (cfile);
     if (!no)
     {
-	fprintf (stderr, "Usage: %s [-v] file...\n", prog);
+        usage(prog);
 	exit (1);
     }
     exit (0);