X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=38dd68315eaa4adf796fc4ce6f17c7e9dd4d75c1;hp=1ed028526988163fcc04ccb56188479a4aa8a226;hb=dd307c65deac044b20c13e99aad2de0d8608a8b7;hpb=6517fa53d35512887780fd07de5667940da18a9e

diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index 1ed0285..38dd683 100644
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_read.c,v $
- * Revision 1.16  1997-09-17 12:10:37  adam
+ * Revision 1.18  1997-11-18 09:51:09  adam
+ * Removed element num_children from data1_node. Minor changes in
+ * data1 to Explain.
+ *
+ * Revision 1.17  1997/11/05 09:20:51  adam
+ * Minor change.
+ *
+ * Revision 1.16  1997/09/17 12:10:37  adam
  * YAZ version 1.4.
  *
  * Revision 1.15  1997/09/05 09:50:57  adam
@@ -125,7 +132,6 @@ data1_node *data1_mk_node (data1_handle dh, NMEM m)
 
     r = nmem_malloc(m, sizeof(*r));
     r->next = r->child = r->last_child = r->parent = 0;
-    r->num_children = 0;
     r->destroy = 0;
     return r;
 }
@@ -168,7 +174,6 @@ data1_node *data1_insert_taggeddata(data1_handle dh, data1_node *root,
 							   0, tagname)))
 	return 0;
     tagn->child = datn = data1_mk_node (dh, m);
-    tagn->num_children = 1;
     datn->parent = tagn;
     datn->root = root;
     datn->which = DATA1N_data;
@@ -176,7 +181,6 @@ data1_node *data1_insert_taggeddata(data1_handle dh, data1_node *root,
     tagn->next = at->child;
     tagn->parent = at;
     at->child = tagn;
-    at->num_children++;
     return datn;
 }
 
@@ -238,10 +242,11 @@ data1_node *data1_read_node (data1_handle dh, char **buf,
 	{
 	    if (!parent)
 		return 0;
-	    if (!*(tag +1) || (parent->which == DATA1N_root && !strcmp(tag + 1,
-		parent->u.root.type)) ||
-		(parent->which == DATA1N_tag && !strcmp(tag + 1,
-		parent->u.tag.tag)))
+	    if (!*(tag +1) ||
+		(parent->which == DATA1N_root &&
+		 !strcmp(tag + 1,parent->u.root.type)) ||
+		(parent->which == DATA1N_tag &&
+		 !strcmp(tag + 1, parent->u.tag.tag)))
 	    {
 		*buf = t + 1;
 		return 0;
@@ -280,8 +285,9 @@ data1_node *data1_read_node (data1_handle dh, char **buf,
 		logf(LOG_WARN, "Malformed variant triple at '%s'", tag);
 		return 0;
 	    }
-	    if (!(tp = data1_getvartypebyct(dh, parent->root->u.root.absyn->varset,
-		tclass, type)))
+	    if (!(tp =
+		  data1_getvartypebyct(dh, parent->root->u.root.absyn->varset,
+				       tclass, type)))
 		return 0;
 	    
 	    /*
@@ -361,8 +367,6 @@ data1_node *data1_read_node (data1_handle dh, char **buf,
 	}
 
 	res->parent = parent;
-	res->num_children = 0;
-
 	pp = &res->child;
 	/*
 	 * Read child nodes.
@@ -370,7 +374,6 @@ data1_node *data1_read_node (data1_handle dh, char **buf,
 	while ((*pp = data1_read_node(dh, buf, res, line, absyn, m)))
 	{
 	    res->last_child = *pp;
-	    res->num_children++;
 	    pp = &(*pp)->next;
 	}
     }