X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_marc.c;h=bb2ea47c3705f765d63cd7df66de94d9c513ab34;hb=424b34cfd7042e0c854ba2ca1f2cc656b61f3e46;hp=75acbb92109804b89d1d0db5601b3003937ed026;hpb=40de6aa3aafbf959d7fc3a1002e8a43874c77d7c;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c
index 75acbb9..bb2ea47 100644
--- a/retrieval/d1_marc.c
+++ b/retrieval/d1_marc.c
@@ -3,7 +3,7 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: d1_marc.c,v 1.19 2002-05-28 21:09:44 adam Exp $
+ * $Id: d1_marc.c,v 1.23 2002-08-19 21:09:10 adam Exp $
  */
 
 
@@ -144,6 +144,7 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
     return res;
 }
 
+
 /*
  * Locate some data under this node. This routine should handle variants
  * prettily.
@@ -151,21 +152,30 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file)
 static char *get_data(data1_node *n, int *len)
 {
     char *r;
+    data1_node *np = 0;
 
-    while (n->which != DATA1N_data && n->child)
-	n = n->child;
-    if (n->which != DATA1N_data || 
-	(n->u.data.what != DATA1I_text && n->u.data.what != DATA1I_num))
+    while (n)
     {
-	r = "[Structured/included data]";
-	*len = strlen(r);
-	return r;
+        if (n->which == DATA1N_data)
+        {
+            *len = n->u.data.len;
+            while (*len && d1_isspace(n->u.data.data[*len - 1]))
+                (*len)--;
+            if (*len != 0)
+                return n->u.data.data;
+        }
+        if (n->which == DATA1N_tag)
+            np = n->child;
+        n = n->next;
+        if (!n)
+        {
+            n = np;
+            np = 0;
+        }
     }
-
-    *len = n->u.data.len;
-    while (*len && d1_isspace(n->u.data.data[*len - 1]))
-	(*len)--;
-    return n->u.data.data;
+    r = "";
+    *len = strlen(r);
+    return r;
 }
 
 static void memint (char *p, int val, int len)
@@ -194,8 +204,9 @@ static int is_indicator (data1_marctab *p, data1_node *subf)
     return 0;
 }
 
-static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
-    char **buf, int *size)
+static int nodetomarc(data1_handle dh,
+		      data1_marctab *p, data1_node *n, int selected,
+                      char **buf, int *size)
 {
     int len = 26;
     int dlen;
@@ -205,6 +216,7 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
     data1_node *field, *subf;
 
     yaz_log (LOG_DEBUG, "nodetomarc");
+
     for (field = n->child; field; field = field->next)
     {
         int is00X = 0;
@@ -216,14 +228,24 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
 	}
 	if (selected && !field->u.tag.node_selected)
 	    continue;
+
+	subf = field->child;
+        if (!subf)
+            continue;
+
         len += 4 + p->length_data_entry + p->length_starting
             + p->length_implementation;
         base_address += 3 + p->length_data_entry + p->length_starting
             + p->length_implementation;
-	subf = field->child;
 
 	if (subf->which == DATA1N_data)
             is00X = 1;
+	if (!data1_is_xmlmode(dh))
+        {
+            if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@"))
+                is00X = 1;
+        }
+            
 	
         if (!is00X)
             len += p->indicator_length;  
@@ -271,9 +293,16 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected,
 	    continue;
 
 	subf = field->child;
+        if (!subf)
+            continue;
 
         if (subf->which == DATA1N_data)
             is00X = 1;
+	if (!data1_is_xmlmode(dh))
+        {
+            if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@"))
+                is00X = 1;
+        }
 
 	if (is_indicator (p, subf))
 	{
@@ -327,6 +356,9 @@ char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n,
     int *size;
     char **buf = data1_get_map_buf (dh, &size);
 
-    *len = nodetomarc(p, n, selected, buf, size);
+    n = data1_get_root_tag (dh, n);
+    if (!n)
+        return 0;
+    *len = nodetomarc(dh, p, n, selected, buf, size);
     return *buf;
 }