Update copyright year + FSF address

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

diff --git a/data1/d1_marc.c b/data1/d1_marc.c
index d2b6dae..19d05df 100644 (file)
--- a/data1/d1_marc.c
+++ b/data1/d1_marc.c
@@ -1,6 +1,6 @@
-/* $Id: d1_marc.c,v 1.9 2004-12-13 20:51:28 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
-   Index Data Aps
+/* $Id: d1_marc.c,v 1.16 2006-08-14 10:40:06 adam Exp $
+   Copyright (C) 1995-2006
+   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 */
@@ -44,10 +44,7 @@ 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;
@@ -164,7 +161,7 @@ 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)
+static char *get_data(data1_node *n, int *len, int chop)
 {
     char *r;
 
@@ -174,15 +171,21 @@ static char *get_data(data1_node *n, int *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;
@@ -265,7 +268,7 @@ static int nodetomarc(data1_handle dh,
        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)
@@ -309,8 +312,12 @@ static int nodetomarc(data1_handle dh,
         for (; subf; subf = subf->next)
         {
             if (!control_field)
+           {
+               if (marc_xml && subf->which != DATA1N_tag)
+                   continue; /* we skip comments, cdata .. */
                 len += p->identifier_length;
-           get_data(subf, &dlen);
+           }
+           get_data(subf, &dlen, control_field ? 0 : 1);
             len += dlen;
         }
     }
@@ -391,9 +398,9 @@ static int nodetomarc(data1_handle dh,
                if (!strcmp(xa->name, "ind1"))
                    indicator_data[0] = xa->value[0];
                if (!strcmp(xa->name, "ind2"))
-                   indicator_data[1] = xa->value[1];
+                   indicator_data[1] = xa->value[0];
                if (!strcmp(xa->name, "ind3"))
-                   indicator_data[2] = xa->value[2];
+                   indicator_data[2] = xa->value[0];
            }
        }
        if (!control_field)
@@ -410,14 +417,16 @@ static int nodetomarc(data1_handle dh,
                 const char *identifier = "a";
                if (marc_xml)
                {
-                   if (subf->which == DATA1N_tag &&
-                       !strcmp(subf->u.tag.tag, "subfield"))
-                   {
-                       data1_xattr *xa;
-                       for (xa = subf->u.tag.attributes; xa; xa = xa->next)
-                           if (!strcmp(xa->name, "code"))
-                               identifier = xa->value;
-                   }
+                   data1_xattr *xa;
+                   if (subf->which != DATA1N_tag)
+                       continue;
+                   if (strcmp(subf->u.tag.tag, "subfield"))
+                       yaz_log(YLOG_WARN, "Unhandled tag %s",
+                               subf->u.tag.tag);
+                   
+                   for (xa = subf->u.tag.attributes; xa; xa = xa->next)
+                       if (!strcmp(xa->name, "code"))
+                           identifier = xa->value;
                }
                else if (subf->which != DATA1N_tag)
                     yaz_log(YLOG_WARN, "Malformed fields for marc output.");
@@ -427,7 +436,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);
+           data = get_data(subf, &dlen, control_field ? 0 : 1);
             memcpy (op + data_p, data, dlen);
             data_p += dlen;
         }
@@ -473,3 +482,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
+ */
+