X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fmarcdump.c;h=00d75960c45f12226113e75a8827e229fb19e31c;hp=43ce28fddfa9b4495eb19480d45940d6e743aa82;hb=6ad80c673e9591ae178154cfe2ce002834cfdafd;hpb=635dd986bff70edc8e8c39067bcc702e59215b56

diff --git a/util/marcdump.c b/util/marcdump.c
index 43ce28f..00d7596 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: marcdump.c,v 1.15 2002-03-18 18:11:45 adam Exp $
+ * $Id: marcdump.c,v 1.23 2003-12-11 00:37:23 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -14,7 +14,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <yaz/wrbuf.h>
+
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+#if HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
 #include <yaz/marcdisp.h>
 #include <yaz/yaz-util.h>
 #include <yaz/xmalloc.h>
@@ -29,7 +36,8 @@
 
 static void usage(const char *prog)
 {
-    fprintf (stderr, "Usage: %s [-c cfile] [-x] [-v] file...\n", prog);
+    fprintf (stderr, "Usage: %s [-c cfile] [-f from] [-t to] [-x] [-O] [-X] [-I] [-v] file...\n",
+             prog);
 } 
 
 int main (int argc, char **argv)
@@ -43,75 +51,151 @@ int main (int argc, char **argv)
     int no = 0;
     int xml = 0;
     FILE *cfile = 0;
+    char *from = 0, *to = 0;
+
+    
+#if HAVE_LOCALE_H
+    setlocale(LC_CTYPE, "");
+#endif
+#if HAVE_LANGINFO_H
+#ifdef CODESET
+    to = nl_langinfo(CODESET);
+#endif
+#endif
 
-    while ((r = options("vc:x", argv, argc, &arg)) != -2)
+    while ((r = options("vc:xOXIf:t:", argv, argc, &arg)) != -2)
     {
 	int count;
 	no++;
         switch (r)
         {
+        case 'f':
+            from = arg;
+            break;
+        case 't':
+            to = arg;
+            break;
 	case 'c':
 	    if (cfile)
 		fclose (cfile);
 	    cfile = fopen (arg, "w");
 	    break;
         case 'x':
-            xml = 1;
+            xml = YAZ_MARC_SIMPLEXML;
+            break;
+        case 'O':
+            xml = YAZ_MARC_OAIMARC;
+            break;
+        case 'X':
+            xml = YAZ_MARC_MARCXML;
             break;
+	case 'I':
+	    xml = YAZ_MARC_ISO2709;
+	    break;
         case 0:
-	    inf = fopen (arg, "r");
+	    inf = fopen (arg, "rb");
 	    count = 0;
 	    if (!inf)
 	    {
 		fprintf (stderr, "%s: cannot open %s:%s\n",
 			 prog, arg, strerror (errno));
-		exit (1);
+		exit(1);
 	    }
 	    if (cfile)
 		fprintf (cfile, "char *marc_records[] = {\n");
-	    while (1)
-	    {
-                WRBUF wr = wrbuf_alloc();
+            if (1)
+            {
+                yaz_marc_t mt = yaz_marc_create();
+                yaz_iconv_t cd = 0;
 
-		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");
-			
+                if (from && to)
+                {
+                    cd = yaz_iconv_open(to, from);
+                    if (!cd)
+                    {
+                        fprintf(stderr, "conversion from %s to %s "
+                                "unsupported\n", from, to);
+                        exit(2);
+                    }
+		    yaz_marc_iconv(mt, cd);
+                }
+                yaz_marc_xml(mt, xml);
+                yaz_marc_debug(mt, verbose);
+                while (1)
+                {
+                    int len;
+                    char *result;
+                    int rlen;
+                    
+                    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 (mt, buf, -1, &result, &rlen);
+                    if (r <= 0)
+                        break;
+#if 1
+		    fwrite (result, rlen, 1, stdout);
+#else
+                    if (!cd)
+                        fwrite (result, rlen, 1, stdout);
+                    else
+                    {
+                        char outbuf[12];
+                        size_t inbytesleft = rlen;
+                        const char *inp = result;
+                        
+                        while (inbytesleft)
+                        {
+                            size_t outbytesleft = sizeof(outbuf);
+                            char *outp = outbuf;
+                            size_t r = yaz_iconv (cd, (char**) &inp,
+                                                  &inbytesleft, 
+                                                  &outp, &outbytesleft);
+                            if (r == (size_t) (-1))
+                            {
+                                int e = yaz_iconv_error(cd);
+                                if (e != YAZ_ICONV_E2BIG)
+                                    break;
+                            }
+                            fwrite (outbuf, outp - outbuf, 1, stdout);
+                        }
+                    }
+#endif
+                    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++;
+                        fprintf (cfile, "\"\n");
+                    }
+                }
+                count++;
+                if (cd)
+                    yaz_iconv_close(cd);
+                yaz_marc_destroy(mt);
 	    }
 	    if (cfile)
 		fprintf (cfile, "};\n");
+	    fclose(inf);
             break;
         case 'v':
 	    verbose++;