Bug fix.

[egate.git] / util / iso2709dump.c

diff --git a/util/iso2709dump.c b/util/iso2709dump.c
index 663dd64..1536fd7 100644 (file)
--- a/util/iso2709dump.c
+++ b/util/iso2709dump.c
@@ -4,7 +4,17 @@
  * Europagate, 1994-1995.
  *
  * $Log: iso2709dump.c,v $
- * Revision 1.7  1995/03/28 16:07:07  adam
+ * Revision 1.10  1995/03/31 09:43:24  adam
+ * Removed test display.
+ *
+ * Revision 1.9  1995/03/30  14:22:18  adam
+ * More work on new MARC anchor functions.
+ *
+ * Revision 1.8  1995/03/30  07:33:37  adam
+ * New 2709 function: iso2709_mk.
+ * First implementation of iso2709_a_insert.
+ *
+ * Revision 1.7  1995/03/28  16:07:07  adam
  * New function: iso2709_out. This function is the reverse of iso2709_cvt.
  *
  * Revision 1.6  1995/03/27  12:52:18  adam
@@ -36,15 +46,36 @@
 
 static char *prog;
 
+static Iso2709Rec copy_rec (Iso2709Rec rec_in)
+{
+    Iso2709Rec rec_out;
+    Iso2709Anchor a_in, a_out;
+    char *tag, *indicator, *identifier, *data;
+
+    rec_out = iso2709_mk();
+
+    a_in = iso2709_a_mk (rec_in);
+    a_out = iso2709_a_mk (rec_out);
+
+    do {
+        if (!iso2709_a_info_field (a_in, &tag, &indicator, &identifier, &data))
+           break;
+        iso2709_a_insert (a_out, tag, indicator, identifier, data);
+    } while (iso2709_a_next (a_in));
+    iso2709_a_rm (a_in);
+    iso2709_a_rm (a_out);
+    return rec_out;
+}
+
 int main (int argc, char **argv)
 {
     char *buf;
-    Iso2709Rec rec;
     int no = 0;
     int start_pos = 0;
     int end_pos = 99999;
     char *output_file = NULL;
     char *input_file = NULL;
+    char *filter = NULL;
     int verbose = 0;
     int quiet = 0;
     FILE *outf = NULL;
@@ -116,6 +147,20 @@ int main (int argc, char **argv)
             case 'q':
                 quiet = 1;
                 break;
+           case 'f':
+                if (argv[0][2])
+                    filter = argv[0]+2;
+                else if (argc > 0)
+                {
+                    --argc;
+                    filter = *++argv;
+                }
+                else
+                {
+                    fprintf (stderr, "%s: missing filter\n", prog);
+                    exit (1);
+                }
+                break;
             default:
                 fprintf (stderr, "%s: unknown option %s; use -h for help\n",
                          prog, *argv);
@@ -151,20 +196,23 @@ int main (int argc, char **argv)
         {
             char *obuf;
             int olen;
+            Iso2709Rec rec_input;
+            Iso2709Rec rec_output;
             
-            rec = iso2709_cvt (buf);
+            rec_input = iso2709_cvt (buf);
             if (!quiet)
                 printf ("------- %d --------\n", no);
-            if (!rec)
+            if (!rec_input)
             {
                 if (!quiet)
                     printf ("Bad record\n");
                 fprintf (stderr, "%s: bad record at position %d\n", prog, no);
                 break;
             }
-            olen = iso2709_out (rec, &obuf, 0);
+            olen = iso2709_out (rec_input, &obuf, 0);
+           rec_output = copy_rec (rec_input);
             if (!quiet)
-                iso2709_display (rec, stdout);
+                iso2709_display (rec_input, stdout);
             if (outf && fwrite (obuf, 1, olen, outf) != olen)
             {
                 fprintf (stderr, "%s: write fail of %s: %s\n",
@@ -172,7 +220,8 @@ int main (int argc, char **argv)
                 exit (1);
             }
             free (obuf);
-            iso2709_rm (rec);
+            iso2709_rm (rec_input);
+           iso2709_rm (rec_output);
         }
         free (buf);
         no++;