X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fmarcdisp.c;h=a0ae4129efe4c2645620f9299f399aa4c96c5df5;hb=59fc25662cfb2144a8f9173616aa70a1da9e4f44;hp=b915f4f21040fbc2b14953f1ed77a71898de1b46;hpb=2d978ce2c9706142728e61af13294613b417ec44;p=yaz-moved-to-github.git

diff --git a/util/marcdisp.c b/util/marcdisp.c
index b915f4f..a0ae412 100644
--- a/util/marcdisp.c
+++ b/util/marcdisp.c
@@ -1,10 +1,31 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdisp.c,v $
- * Revision 1.5  1997-05-01 15:08:15  adam
+ * Revision 1.12  2000-10-02 11:07:44  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/02/29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.10  2000/02/05 10:47:19  adam
+ * Identifier-length and indicator-lenght no longer set to 2 (forced).
+ *
+ * Revision 1.9  1999/12/21 16:24:48  adam
+ * More robust ISO2709 handling (in case of real bad formats).
+ *
+ * Revision 1.8  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.7  1997/09/24 13:29:40  adam
+ * Added verbose option -v to marcdump utility.
+ *
+ * Revision 1.6  1997/09/04 07:52:27  adam
+ * Moved atoi_n function to separate source file.
+ *
+ * Revision 1.5  1997/05/01 15:08:15  adam
  * Added log_mask_str_x routine.
  *
  * Revision 1.4  1995/09/29 17:12:34  quinn
@@ -21,29 +42,17 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <marcdisp.h>
-
-#define ISO2709_RS 035
-#define ISO2709_FS 036
-#define ISO2709_IDFS 037
-
-int atoi_n (const char *buf, int len)
-{
-    int val = 0;
-
-    while (--len >= 0)
-    {
-        if (isdigit (*buf))
-            val = val*10 + (*buf - '0');
-	buf++;
-    }
-    return val;
-}
+#include <yaz/marcdisp.h>
+#include <yaz/yaz-util.h>
 
-int marc_display (const char *buf, FILE *outf)
+int marc_display_ex (const char *buf, FILE *outf, int debug)
 {
     int entry_p;
     int record_length;
@@ -58,17 +67,44 @@ int marc_display (const char *buf, FILE *outf)
         outf = stdout;
     record_length = atoi_n (buf, 5);
     if (record_length < 25)
+    {
+	if (debug)
+	{
+	   fprintf (outf, "Record length %d - aborting\n", record_length);
+
+	}
         return -1;
-    indicator_length = atoi_n (buf+10, 1);
-    identifier_length = atoi_n (buf+11, 1);
+    }
+    if (isdigit(buf[10]))
+        indicator_length = atoi_n (buf+10, 1);
+    else
+        indicator_length = 2;
+    if (isdigit(buf[11]))
+	identifier_length = atoi_n (buf+11, 1);
+    else
+        identifier_length = 2;
     base_address = atoi_n (buf+12, 4);
 
     length_data_entry = atoi_n (buf+20, 1);
     length_starting = atoi_n (buf+21, 1);
     length_implementation = atoi_n (buf+22, 1);
 
+    if (debug)
+    {
+	fprintf (outf, "Record length         %5d\n", record_length);
+	fprintf (outf, "Indicator length      %5d\n", indicator_length);
+	fprintf (outf, "Identifier length     %5d\n", identifier_length);
+	fprintf (outf, "Base address          %5d\n", base_address);
+	fprintf (outf, "Length data entry     %5d\n", length_data_entry);
+	fprintf (outf, "Length starting       %5d\n", length_starting);
+	fprintf (outf, "Length implementation %5d\n", length_implementation);
+    }
     for (entry_p = 24; buf[entry_p] != ISO2709_FS; )
+    {
         entry_p += 3+length_data_entry+length_starting;
+        if (entry_p >= record_length)
+            return -1;
+    }
     base_address = entry_p+1;
     for (entry_p = 24; buf[entry_p] != ISO2709_FS; )
     {
@@ -81,6 +117,8 @@ int marc_display (const char *buf, FILE *outf)
         memcpy (tag, buf+entry_p, 3);
 	entry_p += 3;
         tag[3] = '\0';
+	if (debug)
+	    fprintf (outf, "Tag: ");
 	fprintf (outf, "%s ", tag);
 	data_length = atoi_n (buf+entry_p, length_data_entry);
 	entry_p += length_data_entry;
@@ -88,11 +126,15 @@ int marc_display (const char *buf, FILE *outf)
 	entry_p += length_starting;
 	i = data_offset + base_address;
 	end_offset = i+data_length-1;
+	if (debug)
+	    fprintf (outf, " Ind: ");
         if (memcmp (tag, "00", 2) && indicator_length)
 	{
             for (j = 0; j<indicator_length; j++)
 		fprintf (outf, "%c", buf[i++]);
 	}
+	if (debug)
+	    fprintf (outf, " Fields: ");
 	while (buf[i] != ISO2709_RS && buf[i] != ISO2709_FS && i < end_offset)
 	{
             if (memcmp (tag, "00", 2) && identifier_length)
@@ -118,3 +160,9 @@ int marc_display (const char *buf, FILE *outf)
     return record_length;
 }
 
+int marc_display (const char *buf, FILE *outf)
+{
+    return marc_display_ex (buf, outf, 0);
+}
+
+