Fixed bug #262: spaces in control fields in MARC returned

diff --git a/data1/d1_marc.c b/data1/d1_marc.c
index 2acf4d7..a04ef89 100644 (file)
--- a/data1/d1_marc.c
+++ b/data1/d1_marc.c
@@ -1,4 +1,4 @@
-/* $Id: d1_marc.c,v 1.11 2005-02-02 08:03:22 adam Exp $
+/* $Id: d1_marc.c,v 1.12 2005-02-02 19:37:27 adam Exp $

    Copyright (C) 1995-2005
    Index Data ApS
 
    Copyright (C) 1995-2005
    Index Data ApS
 

@@ -164,7 +164,7 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
  * Locate some data under this node. This routine should handle variants
  * prettily.
  */
  * Locate some data under this node. This routine should handle variants
  * prettily.
  */

-static char *get_data(data1_node *n, int *len)
+static char *get_data(data1_node *n, int *len, int chop)

 {
     char *r;
 
 {
     char *r;
 

@@ -174,15 +174,21 @@ static char *get_data(data1_node *n, int *len)
         {
             int i;
             *len = n->u.data.len;
         {
             int i;
             *len = n->u.data.len;

-
-            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;
+           
+           if (chop)
+            {
+               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;

         }
         if (n->which == DATA1N_tag)
             n = n->child;
         }
         if (n->which == DATA1N_tag)
             n = n->child;

@@ -265,7 +271,7 @@ static int nodetomarc(data1_handle dh,
        else if (!strcmp(field->u.tag.tag, "leader"))
        {
            int dlen = 0;
        else if (!strcmp(field->u.tag.tag, "leader"))
        {
            int dlen = 0;

-           char *dbuf = get_data(subf, &dlen);
+           char *dbuf = get_data(subf, &dlen, 0);

            if (dlen > 24)
                dlen = 24;
            if (dbuf && dlen > 0)
            if (dlen > 24)
                dlen = 24;
            if (dbuf && dlen > 0)

@@ -310,7 +316,7 @@ static int nodetomarc(data1_handle dh,
         {
             if (!control_field)
                 len += p->identifier_length;
         {
             if (!control_field)
                 len += p->identifier_length;

-           get_data(subf, &dlen);
+           get_data(subf, &dlen, control_field ? 0 : 1);

             len += dlen;
         }
     }
             len += dlen;
         }
     }

@@ -427,7 +433,7 @@ static int nodetomarc(data1_handle dh,
                 memcpy (op + data_p+1, identifier, p->identifier_length-1);
                 data_p += p->identifier_length;
             }
                 memcpy (op + data_p+1, identifier, p->identifier_length-1);
                 data_p += p->identifier_length;
             }

-           data = get_data(subf, &dlen);
+           data = get_data(subf, &dlen, control_field ? 0 : 1);

             memcpy (op + data_p, data, dlen);
             data_p += dlen;
         }
             memcpy (op + data_p, data, dlen);
             data_p += dlen;
         }