Bump year

[yaz-moved-to-github.git] / src / marcdisp.c

diff --git a/src/marcdisp.c b/src/marcdisp.c
index 1b02e11..bec05d9 100644 (file)
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: marcdisp.c,v 1.9 2004-11-25 09:43:10 adam Exp $
+ * $Id: marcdisp.c,v 1.12 2005-01-15 19:47:14 adam Exp $
  */
 
 /**
@@ -84,18 +84,28 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
     /* ballout if bsize is known and record_length is less than that */
     if (bsize != -1 && record_length > bsize)
        return -1;
-    if (isdigit(buf[10]))
+    if (isdigit(((const unsigned char *) buf)[10]))
         indicator_length = atoi_n (buf+10, 1);
     else
         indicator_length = 2;
-    if (isdigit(buf[11]))
+    if (isdigit(((const unsigned char *) buf)[11]))
        identifier_length = atoi_n (buf+11, 1);
     else
         identifier_length = 2;
     base_address = atoi_n (buf+12, 5);
 
     length_data_entry = atoi_n (buf+20, 1);
+    if (buf[20] <= '0' || buf[20] >= '9')
+    {
+        wrbuf_printf(wr, "<!-- Length data entry should hold a digit. Assuming 4 -->\n");
+       length_data_entry = 4;
+    }
     length_starting = atoi_n (buf+21, 1);
+    if (buf[21] <= '0' || buf[21] >= '9')
+    {
+        wrbuf_printf(wr, "<!-- Length starting should hold a digit. Assuming 5 -->\n");
+       length_starting = 5;
+    }
     length_implementation = atoi_n (buf+22, 1);
 
     if (mt->xml != YAZ_MARC_LINE)
@@ -248,9 +258,11 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
        int i, j;
        char tag[4];
         int identifier_flag = 0;
+       int entry_p0;
 
         memcpy (tag, buf+entry_p, 3);
        entry_p += 3;
+       entry_p0 = entry_p;
         tag[3] = '\0';
        data_length = atoi_n (buf+entry_p, length_data_entry);
        entry_p += length_data_entry;
@@ -259,6 +271,12 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
        i = data_offset + base_address;
        end_offset = i+data_length-1;
         
+       if (mt->debug)
+       {
+           wrbuf_printf(wr, "<!-- offset=%d data dlength=%d doffset=%d -->\n",
+                   entry_p0, data_length, data_offset);
+       }
+        
         if (indicator_length < 4 && indicator_length > 0)
         {
            if (buf[i + indicator_length] == ISO2709_IDFS)
@@ -409,9 +427,9 @@ int yaz_marc_decode_wrbuf (yaz_marc_t mt, const char *buf, int bsize, WRBUF wr)
         if (mt->xml == YAZ_MARC_LINE)
             wrbuf_putc (wr, '\n');
        if (i < end_offset)
-           wrbuf_puts (wr, "  <!-- separator but not at end of field -->\n");
+           wrbuf_printf(wr, "  <!-- separator but not at end of field length=%d-->\n", data_length);
        if (buf[i] != ISO2709_RS && buf[i] != ISO2709_FS)
-           wrbuf_puts (wr, "  <!-- no separator at end of field -->\n");
+           wrbuf_printf(wr, "  <!-- no separator at end of field length=%d-->\n", data_length);
         switch(mt->xml)
         {
         case YAZ_MARC_SIMPLEXML: