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

diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c
index 2fcdd66..c6bae5a 100644
--- a/retrieval/d1_map.c
+++ b/retrieval/d1_map.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_map.c,v $
- * Revision 1.6  1995-12-12 16:37:08  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
@@ -195,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)
 	{
@@ -229,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;
@@ -255,7 +267,7 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res)
 		    {
 			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;
@@ -285,7 +297,7 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res)
 		    break;
 		}
 	    }
-	    if (map_children(c, map, res) < 0)
+	    if (map_children(c, map, res, mem) < 0)
 		return -1;
 	}
     return 0;
@@ -405,9 +417,9 @@ static int map_record(data1_node *res, data1_node *n, data1_maptab *map)
  * 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;
@@ -419,7 +431,7 @@ data1_node *data1_map_record(data1_node *n, data1_maptab *map)
     res->parent = 0;
     res->root = res;
 
-    if (map_children(n, map, res) < 0)
+    if (map_children(n, map, res, m) < 0)
     {
 	data1_free_tree(res);
 	return 0;