X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_marc.c;h=6c3d0a17180af88a39848c36a6b2b445c26c7b76;hb=7eb2f0de616840d9a340519eac4c271820cd1248;hp=2ac1842e4623cec850f364a1f0d019105ffde726;hpb=cea212fba995de3fa0d6d6723d828f6fd7ca31df;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c
index 2ac1842..6c3d0a1 100644
--- a/retrieval/d1_marc.c
+++ b/retrieval/d1_marc.c
@@ -1,10 +1,28 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_marc.c,v $
- * Revision 1.1  1995-11-01 11:56:08  quinn
+ * Revision 1.7  1997-09-05 09:50:57  adam
+ * Removed global data1_tabpath - uses data1_get_tabpath() instead.
+ *
+ * Revision 1.6  1997/09/04 13:51:58  adam
+ * Added data1 to marc conversion with indicators.
+ *
+ * Revision 1.5  1997/09/04 13:48:04  adam
+ * Added data1 to marc conversion.
+ *
+ * Revision 1.4  1996/03/25 10:18:03  quinn
+ * Removed trailing whitespace from data elements
+ *
+ * Revision 1.3  1995/11/01  16:34:57  quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.2  1995/11/01  13:54:48  quinn
+ * Minor adjustments
+ *
+ * Revision 1.1  1995/11/01  11:56:08  quinn
  * Added Retrieval (data management) functions en masse.
  *
  *
@@ -14,16 +32,15 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <oid.h>
 #include <log.h>
+#include <marcdisp.h>
 #include <readconf.h>
 #include <xmalloc.h>
-#include "data1.h"
-
-#define ISO2709_RS 035
-#define ISO2709_FS 036
-#define ISO2709_IDFS 037
+#include <data1.h>
+#include <tpath.h>
 
 data1_marctab *data1_read_marctab(char *file)
 {
@@ -32,7 +49,7 @@ data1_marctab *data1_read_marctab(char *file)
     char line[512], *argv[50];
     int argc;
     
-    if (!(f = fopen(file, "r")))
+    if (!(f = yaz_path_fopen(data1_get_tabpath(), file, "r")))
     {
 	logf(LOG_WARN|LOG_ERRNO, "%s", file);
 	return 0;
@@ -138,6 +155,8 @@ static char *get_data(data1_node *n, int *len)
     }
 
     *len = n->u.data.len;
+    while (*len && isspace(n->u.data.data[*len - 1]))
+	(*len)--;
     return n->u.data.data;
 }
 
@@ -154,6 +173,19 @@ static void memint (char *p, int val, int len)
     }
 }
 
+static int is_indicator (data1_marctab *p, data1_node *subf)
+{
+#if 1
+    if (p->indicator_length != 2 ||
+	(subf->which == DATA1N_tag && strlen(subf->u.tag.tag) == 2))
+	return 1;
+#else
+    if (subf->which == DATA1N_tag && subf->child->which == DATA1N_tag)
+	return 1;
+#endif
+    return 0;
+}
+
 static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
     char **buf, int *size)
 {
@@ -179,7 +211,13 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
             + p->length_implementation;
 	if (strncmp(field->u.tag.tag, "00", 2))
             len += p->indicator_length;      /* this is fairly bogus */
-        for (subf = field->child; subf; subf = subf->next)
+	subf = field->child;
+	
+	/*  we'll allow no indicator if length is not 2 */
+	if (is_indicator (p, subf))
+	    subf = subf->child;
+
+        for (; subf; subf = subf->next)
         {
 	    if (subf->which != DATA1N_tag)
 	    {
@@ -218,14 +256,23 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
     for (field = n->child; field; field = field->next)
     {
         int data_0 = data_p;
+	char *indicator_data = "    ";
 	if (selected && !field->u.tag.node_selected)
 	    continue;
+
+	subf = field->child;
+
+	if (is_indicator (p, subf))
+	{
+            indicator_data = subf->u.tag.tag;
+	    subf = subf->child;
+	}
         if (strncmp(field->u.tag.tag, "00", 2))   /* bogus */
         {
-            memcpy (op + data_p, "  ", p->indicator_length);
+            memcpy (op + data_p, indicator_data, p->indicator_length);
             data_p += p->indicator_length;
         }
-        for (subf = field->child; subf; subf = subf->next)
+        for (; subf; subf = subf->next)
         {
 	    char *data;