X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_map.c;h=c6bae5a2e4c6d9b10bc3e0489ebae4a1ceca4368;hp=98d6b8bf4aa5972a254c65f7dbeb72c4d297d366;hb=0ff5815242556923f24a9dcbbad9ebe30e64f165;hpb=378fb34b7013a9f6b15fd632f987a339da80b907

diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c
index 98d6b8b..c6bae5a 100644
--- a/retrieval/d1_map.c
+++ b/retrieval/d1_map.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_map.c,v $
- * Revision 1.4  1995-12-11 15:22:37  quinn
+ * Revision 1.8  1996-05-01 12:45:31  quinn
+ * Support use of local tag names in abs file.
+ *
+ * Revision 1.7  1995/12/13  13:44:31  quinn
+ * Modified Data1-system to use nmem
+ *
+ * Revision 1.6  1995/12/12  16:37:08  quinn
+ * Added destroy element to data1_node.
+ *
+ * Revision 1.5  1995/12/12  14:11:31  quinn
+ * More work on the large-record problem.
+ *
+ * Revision 1.4  1995/12/11  15:22:37  quinn
  * Added last_child field to the node.
  * Rewrote schema-mapping.
  *
@@ -161,7 +173,7 @@ data1_maptab *data1_read_maptab(char *file)
     return res;
 }
 
-#if 0
+#if 1
 
 /*
  * Locate node with givel elementname.
@@ -189,7 +201,12 @@ static int tagmatch(data1_node *n, data1_maptag *t)
 	return 0;
     if (n->u.tag.element)
     {
-	if (n->u.tag.element->tag->tagset->type != t->type)
+	if (n->u.tag.element->tag->tagset)
+	{
+	    if (n->u.tag.element->tag->tagset->type != t->type)
+		return 0;
+	}
+	else if (t->type != 3)
 	    return 0;
 	if (n->u.tag.element->tag->which == DATA1T_numeric)
 	{
@@ -223,7 +240,8 @@ static int tagmatch(data1_node *n, data1_maptag *t)
     return 1;
 }
 
-static int map_children(data1_node *n, data1_maptab *map, data1_node *res)
+static int map_children(data1_node *n, data1_maptab *map, data1_node *res,
+    NMEM mem)
 {
     data1_node *c;
     data1_mapunit *m;
@@ -239,61 +257,47 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res)
 		    c->u.tag.element->name))
 		{
 		    data1_node *pn = res;
+		    data1_node *cur = pn->last_child;
 		    data1_maptag *mt;
-		    data1_node *l;
 
 		    /*
 		     * process the target path specification.
 		     */
 		    for (mt = m->target_path; mt; mt = mt->next)
 		    {
-			int match = 0;
-			data1_node *cur;
-			data1_node *last;
-
-			for (l = pn->child, last = 0; l; last = l, l = l->next)
-			    if (!match)
-				match = tagmatch(l, mt);
-			    else
-				if (!tagmatch(l, mt))
-				    break;
-			if (!match || !mt->next || mt->new_field)
+			if (!cur || mt->new_field || !tagmatch(cur, mt))
 			{
-			    cur = data1_mk_node();
+			    cur = data1_mk_node(mem);
 			    cur->which = DATA1N_tag;
 			    cur->u.tag.element = 0;
 			    cur->u.tag.tag = mt->value.string;
 			    cur->u.tag.node_selected = 0;
 			    cur->parent = pn;
 			    cur->root = pn->root;
-			    if (!last)
-			    {
-				cur->next = pn->child;
+			    if (!pn->child)
 				pn->child = cur;
-			    }
-			    else
-			    {
-				cur->next = last->next;
-				last->next = cur;
-			    }
+			    if (pn->last_child)
+				pn->last_child->next = cur;
+			    pn->last_child = cur;
 			    pn->num_children++;
 			}
-			else
-			    cur = last ? last : pn->child;
 			
-			if (mt ->next)
+			if (mt->next)
 			    pn = cur;
 			else if (!m->no_data)
 			{
 			    cur->child = c->child;
+			    cur->last_child = c->last_child;
 			    cur->num_children = c->num_children;
 			    c->child = 0;
+			    c->last_child = 0;
 			    c->num_children = 0;
 			}
 		    }
+		    break;
 		}
 	    }
-	    if (map_children(c, map, res) < 0)
+	    if (map_children(c, map, res, mem) < 0)
 		return -1;
 	}
     return 0;
@@ -406,14 +410,16 @@ static int map_record(data1_node *res, data1_node *n, data1_maptab *map)
     return 0;
 }
 
+#endif
+
 /*
  * Create a (possibly lossy) copy of the given record based on the
  * table. The new copy will refer back to the data of the original record,
  * which should not be discarded during the lifetime of the copy.
  */
-data1_node *data1_map_record(data1_node *n, data1_maptab *map)
+data1_node *data1_map_record(data1_node *n, data1_maptab *map, NMEM m)
 {
-    data1_node *res = data1_mk_node();
+    data1_node *res = data1_mk_node(m);
 
     res->which = DATA1N_root;
     res->u.root.type = map->target_absyn_name;
@@ -425,7 +431,7 @@ data1_node *data1_map_record(data1_node *n, data1_maptab *map)
     res->parent = 0;
     res->root = res;
 
-    if (map_record(res, n, map) < 0)
+    if (map_children(n, map, res, m) < 0)
     {
 	data1_free_tree(res);
 	return 0;
@@ -433,4 +439,3 @@ data1_node *data1_map_record(data1_node *n, data1_maptab *map)
     return res;
 }
 
-#endif