X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_marc.c;h=841cd58fa09d3a53876e3db6c2b36d0ffd34ba11;hp=a091cc635b739c90d5d2261b347ae1a92fe8833f;hb=5c3b39c38610d49f2a2742ba10b816f67504d5c3;hpb=676ae79af06721621b1f66bdaec06164b3ba7b1f

diff --git a/data1/d1_marc.c b/data1/d1_marc.c
index a091cc6..841cd58 100644
--- a/data1/d1_marc.c
+++ b/data1/d1_marc.c
@@ -1,8 +1,5 @@
-/* $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.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -22,6 +19,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 /* converts data1 tree to ISO2709/MARC record */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,7 +42,7 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
     char line[512], *argv[50];
     int lineno = 0;
     int argc;
-    
+
     if (!(f = data1_path_fopen(dh, file, "r")))
 	return 0;
 
@@ -61,7 +61,7 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
     res->force_indicator_length = -1;
     res->force_identifier_length = -1;
     strcpy(res->user_systems, "z  ");
-    
+
     while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
 	if (!strcmp(*argv, "name"))
 	{
@@ -82,7 +82,7 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
 		continue;
 	    }
             res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
-                                              CLASS_TAGSET, argv[1], 
+                                              CLASS_TAGSET, argv[1],
                                               mem);
 	    if (!res->oid)
 	    {
@@ -151,6 +151,21 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
 	    }
 	    res->force_identifier_length = atoi(argv[1]);
 	}
+	else if (!strcmp(*argv, "implementation-codes"))
+	{
+	    if (argc != 2)
+	    {
+		yaz_log(YLOG_WARN, "%s:%d: Missing arg for %s", file, lineno,
+			*argv);
+		continue;
+	    }
+            /* up to 4 characters .. space pad */
+            if (strlen(argv[1]) > 4)
+	        yaz_log(YLOG_WARN, "%s:%d: Max 4 characters for "
+                                   "implementation-codes", file, lineno);
+            else
+                memcpy(res->implementation_codes, argv[1], strlen(argv[1]));
+	}
 	else
 	    yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno,
 		    *argv);
@@ -177,12 +192,12 @@ static void get_data2(data1_node *n, int *len, char *dst, size_t max)
             }
             *len += n->u.data.len;
         }
-        if (n->which == DATA1N_tag)
+        if (n->which == DATA1N_tag && *len == 0)
             n = n->child;
 	else if (n->which == DATA1N_data)
             n = n->next;
 	else
-            break;	
+            break;
     }
 }
 
@@ -245,11 +260,11 @@ static int nodetomarc(data1_handle dh,
 	    continue;
 	if (selected && !field->u.tag.node_selected)
 	    continue;
-	    
+
 	subf = field->child;
         if (!subf)
             continue;
-	
+
 	if (!yaz_matchstr(field->u.tag.tag, "mc?"))
 	    continue;
 	else if (!strcmp(field->u.tag.tag, "leader"))
@@ -285,13 +300,13 @@ static int nodetomarc(data1_handle dh,
             + p->length_implementation;
 
         if (!control_field)
-            len += p->indicator_length;  
+            len += p->indicator_length;
 
 	/* we'll allow no indicator if length is not 2 */
 	/* select when old XML format, since indicator is an element */
 	if (marc_xml == 0 && is_indicator (p, subf))
 	    subf = subf->child;
-	
+
         for (; subf; subf = subf->next)
         {
             if (!control_field)
@@ -309,7 +324,7 @@ static int nodetomarc(data1_handle dh,
 	*buf = (char *)xmalloc(*size = len);
     else if (*size <= len)
 	*buf = (char *)xrealloc(*buf, *size = len);
-	
+
     op = *buf;
 
     /* we know the base address now */
@@ -318,7 +333,7 @@ static int nodetomarc(data1_handle dh,
     /* copy temp leader to real output buf op */
     memcpy (op, leader, 24);
     memint (op, len, 5);
-    
+
     entry_p = 24;
     data_p = base_address;
 
@@ -343,7 +358,7 @@ static int nodetomarc(data1_handle dh,
 	subf = field->child;
         if (!subf)
             continue;
-	
+
 	if (!yaz_matchstr(field->u.tag.tag, "mc?"))
 	    continue;
 	else if (!strcmp(field->u.tag.tag, "leader"))
@@ -404,7 +419,7 @@ static int nodetomarc(data1_handle dh,
 		    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;
@@ -435,7 +450,7 @@ static int nodetomarc(data1_handle dh,
 	if (!tag || strlen(tag) != 3)
 	    tag = "000";
 	memcpy (op + entry_p, tag, 3);
-	
+
         entry_p += 3;
         memint (op + entry_p, data_p - data_0, p->length_data_entry);
         entry_p += p->length_data_entry;
@@ -465,6 +480,7 @@ char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab