X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdump.c;h=551bd07067766764217e4aa5ffc1ee20f0d31cf1;hb=e8d4a4b06783f74ff4e6a32f4f4b2622473d1b3c;hp=02507d4d5c66cfe51753c9a861e0939a5b97a201;hpb=62e356bd92b3ab4c97d82dfdce290ca84f0759ca;p=yaz-moved-to-github.git

diff --git a/util/marcdump.c b/util/marcdump.c
index 02507d4..551bd07 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,10 +1,29 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdump.c,v $
- * Revision 1.6  1997-12-12 06:32:33  adam
+ * 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
@@ -24,13 +43,17 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <marcdisp.h>
-#include <xmalloc.h>
-#include <options.h>
+#include <yaz/marcdisp.h>
+#include <yaz/xmalloc.h>
+#include <yaz/options.h>
 
 #ifndef SEEK_SET
 #define SEEK_SET 0
@@ -46,16 +69,22 @@ int main (int argc, char **argv)
     int verbose = 0;
     FILE *inf;
     long file_size;
-    char *buf;
+    char *buf, *p;
     char *prog = *argv;
     int count = 0;
     int no = 0;
+    FILE *cfile = 0;
 
-    while ((ret = options("v", argv, argc, &arg)) != -2)
+    while ((ret = options("vc:", argv, argc, &arg)) != -2)
     {
 	no++;
         switch (ret)
         {
+	case 'c':
+	    if (cfile)
+		fclose (cfile);
+	    cfile = fopen (arg, "w");
+	    break;
         case 0:
 	    inf = fopen (arg, "r");
 	    if (!inf)
@@ -77,24 +106,50 @@ int main (int argc, char **argv)
 			 prog, arg, strerror (errno));
 		exit (1);
 	    }
-	    buf = xmalloc (file_size);
+	    buf = (char *)xmalloc (file_size);
 	    if (!buf)
 	    {
 		fprintf (stderr, "%s: cannot xmalloc: %s\n",
 			 prog, strerror (errno));
 		exit (1);
 	    }
-	    if (fread (buf, 1, file_size, inf) != file_size)
+	    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)
+	    if (cfile)
+	    {
+		fprintf (cfile, "char *marc_records[] = {\n");
+	    }
+	    for (p = buf; (ret = marc_display_ex (p, stdout, verbose)) > 0;)
 	    {
-		buf += ret;
+		if (cfile)
+		{
+		    int i;
+		    if (p != buf)
+			fprintf (cfile, ",");
+		    fprintf (cfile, "{\n");
+		    for (i = 0; i<ret; i++)
+		    {
+			if ((i & 15) == 0)
+			    fprintf (cfile, "  \"");
+			fprintf (cfile, "\\x%02X", p[i] & 255);
+			
+			if (i < ret - 1 && (i & 15) == 15)
+			    fprintf (cfile, "\"\n");
+			
+		    }
+		    fprintf (cfile, "\"\n}");
+		}
+		p += ret;
 		count++;
 	    }
+	    if (cfile)
+	    {
+		fprintf (cfile, "};\n");
+	    }
 	    fclose (inf);
 	    xfree (buf);
             break;
@@ -102,10 +157,12 @@ int main (int argc, char **argv)
 	    verbose++;
             break;
         default:
-            fprintf (stderr, "Usage: %s [-v] file...\n", prog);
+            fprintf (stderr, "Usage: %s [-c cfile] [-v] file...\n", prog);
             exit (1);
         }
     }
+    if (cfile)
+	fclose (cfile);
     if (!no)
     {
 	fprintf (stderr, "Usage: %s [-v] file...\n", prog);