Removed duplicate variable for turbo marcxml (using_turbo_format). Now works in zooms...

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

diff --git a/src/marc_read_iso2709.c b/src/marc_read_iso2709.c
index aee41b4..7edf8be 100644 (file)
--- a/src/marc_read_iso2709.c
+++ b/src/marc_read_iso2709.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: marc_read_iso2709.c,v 1.1 2006-12-15 12:37:18 adam Exp $
  */
 
 /**
@@ -151,8 +149,23 @@ int yaz_marc_read_iso2709(yaz_marc_t mt, const char *buf, int bsize)
         {
             /* datafield */
             i += identifier_flag-1;
-            yaz_marc_add_datafield(mt, tag, buf+i, indicator_length);
-            i += indicator_length;
+            if (indicator_length)
+            {
+                /* skip RS/FS bytes in indicator. They are not allowed there */
+                int j;
+                for (j = indicator_length; --j >= 0; )
+                    if (buf[j+i] < ' ')
+                    {
+                        j++;
+                        i += j;
+                        end_offset += j;
+                        yaz_marc_cprintf(mt, "Bad indicator data. "
+                                         "Skipping %d bytes", j);
+                        break;
+                    }
+                yaz_marc_add_datafield(mt, tag, buf+i, indicator_length);
+                i += indicator_length;
+            }
 
             while (i < end_offset &&
                     buf[i] != ISO2709_RS && buf[i] != ISO2709_FS)
@@ -164,7 +177,8 @@ int yaz_marc_read_iso2709(yaz_marc_t mt, const char *buf, int bsize)
                         buf[i] != ISO2709_RS && buf[i] != ISO2709_IDFS &&
                        buf[i] != ISO2709_FS)
                     i++;
-                yaz_marc_add_subfield(mt, buf+code_offset, i - code_offset);
+                if (i > code_offset)
+                    yaz_marc_add_subfield(mt, buf+code_offset, i - code_offset);
             }
         }
         else
@@ -184,7 +198,7 @@ int yaz_marc_read_iso2709(yaz_marc_t mt, const char *buf, int bsize)
         if (buf[i] != ISO2709_RS && buf[i] != ISO2709_FS)
         {
             yaz_marc_cprintf(mt, "No separator at end of field length=%d",
-                    data_length);
+                             data_length);
         }
     }
     return record_length;
@@ -193,6 +207,7 @@ int yaz_marc_read_iso2709(yaz_marc_t mt, const char *buf, int bsize)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab