For data-1, do not chop text data in ISO2709 creation . The problem is

[idzebra-moved-to-github.git] / data1 / d1_marc.c

diff --git a/data1/d1_marc.c b/data1/d1_marc.c
index a7d8a7b..a091cc6 100644 (file)
--- a/data1/d1_marc.c
+++ b/data1/d1_marc.c
@@ -1,5 +1,5 @@
-/* $Id: d1_marc.c,v 1.13 2006-02-10 15:19:55 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: d1_marc.c,v 1.19 2007-06-27 22:17:20 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 /* converts data1 tree to ISO2709/MARC record */
@@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 
 #include <yaz/log.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
 #include <yaz/marcdisp.h>
 #include <yaz/readconf.h>
 #include <yaz/xmalloc.h>
@@ -44,13 +44,10 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
     int argc;
     
     if (!(f = data1_path_fopen(dh, file, "r")))
-    {
-       yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
        return 0;
-    }
 
     res->name = 0;
-    res->reference = VAL_NONE;
+    res->oid = 0;
     res->next = 0;
     res->length_data_entry = 4;
     res->length_starting = 5;
@@ -84,7 +81,10 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
                        *argv);
                continue;
            }
-           if ((res->reference = oid_getvalbyname(argv[1])) == VAL_NONE)
+            res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+                                              CLASS_TAGSET, argv[1], 
+                                              mem);
+           if (!res->oid)
            {
                yaz_log(YLOG_WARN, "%s:%d: Unknown tagset reference '%s'",
                        file, lineno, argv[1]);
@@ -160,35 +160,22 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
 }
 
 
-/*
- * Locate some data under this node. This routine should handle variants
- * prettily.
- */
-static char *get_data(data1_node *n, int *len, int chop)
+static void get_data2(data1_node *n, int *len, char *dst, size_t max)
 {
-    char *r;
+    *len = 0;
 
     while (n)
     {
         if (n->which == DATA1N_data)
         {
-            int i;
-            *len = n->u.data.len;
-           
-           if (chop)
+            if (dst && *len < max)
             {
-               for (i = 0; i<*len; i++)
-                   if (!d1_isspace(n->u.data.data[i]))
-                       break;
-               while (*len && d1_isspace(n->u.data.data[*len - 1]))
-                   (*len)--;
-               *len = *len - i;
-               if (*len > 0)
-                   return n->u.data.data + i;
-           }
-           else
-               if (*len > 0)
-                   return n->u.data.data;
+                size_t copy_len = max - *len;
+                if (copy_len > n->u.data.len)
+                    copy_len = n->u.data.len;
+                memcpy(dst + *len, n->u.data.data, copy_len);
+            }
+            *len += n->u.data.len;
         }
         if (n->which == DATA1N_tag)
             n = n->child;
@@ -197,9 +184,6 @@ static char *get_data(data1_node *n, int *len, int chop)
        else
             break;     
     }
-    r = "";
-    *len = strlen(r);
-    return r;
 }
 
 static void memint (char *p, int val, int len)
@@ -271,11 +255,7 @@ static int nodetomarc(data1_handle dh,
        else if (!strcmp(field->u.tag.tag, "leader"))
        {
            int dlen = 0;
-           char *dbuf = get_data(subf, &dlen, 0);
-           if (dlen > 24)
-               dlen = 24;
-           if (dbuf && dlen > 0)
-               memcpy (leader, dbuf, dlen);
+            get_data2(subf, &dlen, leader, 24);
            continue;
        }
        else if (!strcmp(field->u.tag.tag, "controlfield"))
@@ -320,7 +300,7 @@ static int nodetomarc(data1_handle dh,
                    continue; /* we skip comments, cdata .. */
                 len += p->identifier_length;
            }
-           get_data(subf, &dlen, control_field ? 0 : 1);
+            get_data2(subf, &dlen, 0, 0);
             len += dlen;
         }
     }
@@ -413,8 +393,6 @@ static int nodetomarc(data1_handle dh,
        }
        for (; subf; subf = subf->next)
         {
-           char *data;
-
             if (!control_field)
             {
                 const char *identifier = "a";
@@ -439,8 +417,7 @@ static int nodetomarc(data1_handle dh,
                 memcpy (op + data_p+1, identifier, p->identifier_length-1);
                 data_p += p->identifier_length;
             }
-           data = get_data(subf, &dlen, control_field ? 0 : 1);
-            memcpy (op + data_p, data, dlen);
+            get_data2(subf, &dlen, op + data_p, 100000);
             data_p += dlen;
         }
         op[data_p++] = ISO2709_FS;
@@ -485,3 +462,11 @@ char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n,
     *len = nodetomarc(dh, p, n, selected, buf, size);
     return *buf;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+