Added body-of-text to BIB-1 ANY and the WAIS profile

[yaz-moved-to-github.git] / retrieval / d1_map.c

diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c
index 73792e3..c6bae5a 100644 (file)
--- a/retrieval/d1_map.c
+++ b/retrieval/d1_map.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_map.c,v $
- * Revision 1.5  1995-12-12 14:11:31  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
@@ -192,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)
        {
@@ -226,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;
@@ -250,9 +265,9 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res)
                     */
                    for (mt = m->target_path; mt; mt = mt->next)
                    {
-                       if (!cur || !tagmatch(cur, mt))
+                       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;
@@ -282,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;
@@ -402,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;
@@ -416,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;