X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=util%2Fmarcdisp.c;h=3249b53574bc898a769c075dca4c279a4a7e7b66;hb=b24d2d58cd28380a1969780e5e2d7c4f0719f81c;hp=3806681cc0f0338324b6a972679a64cb8e662296;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/util/marcdisp.c b/util/marcdisp.c
index 3806681..3249b53 100644
--- a/util/marcdisp.c
+++ b/util/marcdisp.c
@@ -1,10 +1,32 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: marcdisp.c,v $
- * Revision 1.8  1999-11-30 13:47:12  adam
+ * Revision 1.15  2001-10-29 09:17:19  adam
+ * New function marc_display_exl - used by YAZ client. Server returns
+ * bad record on position 98 (for testing).
+ *
+ * Revision 1.14  2001/10/23 21:00:20  adam
+ * Old Z39.50 codecs gone. Added ZOOM. WRBUF MARC display util.
+ *
+ * Revision 1.13  2001/10/15 19:36:48  adam
+ * New function marc_display_wrbuf.
+ *
+ * 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
@@ -30,13 +52,19 @@
  *
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 #include <yaz/marcdisp.h>
+#include <yaz/wrbuf.h>
 #include <yaz/yaz-util.h>
 
-int marc_display_ex (const char *buf, FILE *outf, int debug)
+int marc_display_wrbuf (const char *buf, WRBUF wr, int debug,
+			int bsize)
 {
     int entry_p;
     int record_length;
@@ -47,33 +75,59 @@ int marc_display_ex (const char *buf, FILE *outf, int debug)
     int length_starting;
     int length_implementation;
 
-    if (!outf)
-        outf = stdout;
     record_length = atoi_n (buf, 5);
     if (record_length < 25)
+    {
+	if (debug)
+	{
+	    char str[40];
+	    
+	    sprintf (str, "Record length %d - aborting\n", record_length);
+	    wrbuf_puts (wr, str);
+	}
         return -1;
-    indicator_length = atoi_n (buf+10, 1);
-    identifier_length = atoi_n (buf+11, 1);
+    }
+    /* ballout if bsize is known and record_length is than that */
+    if (bsize != -1 && record_length > bsize)
+	return -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);
 
-    indicator_length = identifier_length = 2;
-
     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);
+	char str[40];
+	sprintf (str, "Record length         %5d\n", record_length);
+	wrbuf_puts (wr, str);
+	sprintf (str, "Indicator length      %5d\n", indicator_length);
+	wrbuf_puts (wr, str);
+	sprintf (str, "Identifier length     %5d\n", identifier_length);
+	wrbuf_puts (wr, str);
+	sprintf (str, "Base address          %5d\n", base_address);
+	wrbuf_puts (wr, str);
+	sprintf (str, "Length data entry     %5d\n", length_data_entry);
+	wrbuf_puts (wr, str);
+	sprintf (str, "Length starting       %5d\n", length_starting);
+	wrbuf_puts (wr, str);
+	sprintf (str, "Length implementation %5d\n", length_implementation);
+	wrbuf_puts (wr, str);
     }
     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; )
     {
@@ -87,8 +141,9 @@ int marc_display_ex (const char *buf, FILE *outf, int debug)
 	entry_p += 3;
         tag[3] = '\0';
 	if (debug)
-	    fprintf (outf, "Tag: ");
-	fprintf (outf, "%s ", tag);
+	    wrbuf_puts (wr, "Tag: ");
+	wrbuf_puts (wr, tag);
+	wrbuf_puts (wr, " ");
 	data_length = atoi_n (buf+entry_p, length_data_entry);
 	entry_p += length_data_entry;
 	data_offset = atoi_n (buf+entry_p, length_starting);
@@ -96,39 +151,66 @@ int marc_display_ex (const char *buf, FILE *outf, int debug)
 	i = data_offset + base_address;
 	end_offset = i+data_length-1;
 	if (debug)
-	    fprintf (outf, " Ind: ");
+	    wrbuf_puts (wr, " Ind: ");
         if (memcmp (tag, "00", 2) && indicator_length)
 	{
-            for (j = 0; j<indicator_length; j++)
-		fprintf (outf, "%c", buf[i++]);
+            for (j = 0; j<indicator_length; j++, i++)
+		wrbuf_putc (wr, buf[i]);
 	}
 	if (debug)
-	    fprintf (outf, " Fields: ");
+	    wrbuf_puts (wr, " Fields: ");
 	while (buf[i] != ISO2709_RS && buf[i] != ISO2709_FS && i < end_offset)
 	{
             if (memcmp (tag, "00", 2) && identifier_length)
 	    {
 	        i++;
-	        fprintf (outf, " $"); 
-                for (j = 1; j<identifier_length; j++)
-                    fprintf (outf, "%c", buf[i++]);
-		fprintf (outf, " ");
+		wrbuf_puts (wr, " $"); 
+                for (j = 1; j<identifier_length; j++, i++)
+		    wrbuf_putc (wr, buf[i]);
+		wrbuf_putc (wr, ' ');
 	        while (buf[i] != ISO2709_RS && buf[i] != ISO2709_IDFS &&
 	               buf[i] != ISO2709_FS && i < end_offset)
-	            fprintf (outf, "%c", buf[i++]);
+		{
+		    wrbuf_putc (wr, buf[i]);
+		    i++;
+		}
 	    }
 	    else
-	        fprintf (outf, "%c", buf[i++]);
+	    {
+		wrbuf_putc (wr, buf[i]);
+		i++;
+	    }
 	}
-	fprintf (outf, "\n");
+	wrbuf_putc (wr, '\n');
 	if (i < end_offset)
-	    fprintf (outf, "-- separator but not at end of field\n");
+	    wrbuf_puts (wr, "-- separator but not at end of field\n");
 	if (buf[i] != ISO2709_RS && buf[i] != ISO2709_FS)
-	    fprintf (outf, "-- no separator at end of field\n");
+	    wrbuf_puts (wr, "-- no separator at end of field\n");
     }
+    wrbuf_puts (wr, "");
+    return record_length;
+}
+
+int marc_display_exl (const char *buf, FILE *outf, int debug, int length)
+{
+    int record_length;
+
+    WRBUF wrbuf = wrbuf_alloc ();
+    record_length = marc_display_wrbuf (buf, wrbuf, debug, length);
+    if (!outf)
+	outf = stdout;
+    if (record_length > 0)
+	fwrite (wrbuf_buf(wrbuf), 1, wrbuf_len(wrbuf), outf);
+    wrbuf_free (wrbuf, 1);
     return record_length;
 }
 
+
+int marc_display_ex (const char *buf, FILE *outf, int debug)
+{
+    return marc_display_exl (buf, outf, debug, -1);
+}
+
 int marc_display (const char *buf, FILE *outf)
 {
     return marc_display_ex (buf, outf, 0);