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

diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c
index cec007e..c6bae5a 100644
--- a/retrieval/d1_map.c
+++ b/retrieval/d1_map.c
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_map.c,v $
- * Revision 1.2  1995-11-01 13:54:46  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.
+ *
+ * Revision 1.3  1995/11/01  16:34:56  quinn
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.2  1995/11/01  13:54:46  quinn
  * Minor adjustments
  *
  * Revision 1.1  1995/11/01  11:56:08  quinn
@@ -22,6 +41,7 @@
 #include <log.h>
 #include <readconf.h>
 
+#include <tpath.h>
 #include <data1.h>
 #include "d1_map.h"
 
@@ -33,7 +53,7 @@ data1_maptab *data1_read_maptab(char *file)
     char *argv[50], line[512];
     data1_mapunit **mapp;
 
-    if (!(f = fopen(file, "r")))
+    if (!(f = yaz_path_fopen(data1_tabpath, file, "r")))
     {
 	logf(LOG_WARN|LOG_ERRNO, "%s", file);
 	return 0;
@@ -109,7 +129,6 @@ data1_maptab *data1_read_maptab(char *file)
 	    {
 		int type, np;
 		char valstr[512], parm[512];
-		int numval;
 
 		if (ep)
 		    ep++;
@@ -154,6 +173,8 @@ data1_maptab *data1_read_maptab(char *file)
     return res;
 }
 
+#if 1
+
 /*
  * Locate node with givel elementname.
  * NOTE: This is stupid - we don't find repeats this way.
@@ -180,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)
 	{
@@ -214,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;
@@ -230,74 +257,169 @@ 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;
 }
 
+
+#else
+
+/*
+ * See if the node n is equivalent to the tag t.
+ */
+static int tagmatch(data1_node *n, data1_maptag *t)
+{
+    if (n->which != DATA1N_tag)
+	return 0;
+    if (n->u.tag.element)
+    {
+	if (n->u.tag.element->tag->tagset->type != t->type)
+	    return 0;
+	if (n->u.tag.element->tag->which == DATA1T_numeric)
+	{
+	    if (t->which != D1_MAPTAG_numeric)
+		return 0;
+	    if (n->u.tag.element->tag->value.numeric != t->value.numeric)
+		return 0;
+	}
+	else
+	{
+	    if (t->which != D1_MAPTAG_string)
+		return 0;
+	    if (data1_matchstr(n->u.tag.element->tag->value.string,
+		t->value.string))
+		return 0;
+	}
+    }
+    else /* local tag */
+    {
+	char str[10];
+
+	if (t->type != 3)
+	    return 0;
+	if (t->which == D1_MAPTAG_numeric)
+	    sprintf(str, "%d", t->value.numeric);
+	else
+	    strcpy(str, t->value.string);
+	if (data1_matchstr(n->u.tag.tag, str))
+	    return 0;
+    }
+    return 1;
+}
+
+static int map_elements(data1_node *res, data1_node *n, data1_mapunit *m)
+{
+    data1_node *c;
+
+    for (c = n->child; c; c = c->next)
+    {
+	if (c->which == DATA1N_tag)
+	{
+	    if (c->u.tag.element && !data1_matchstr(c->u.tag.element->name,
+		m->source_element_name))
+	    {
+		/* Process target path specification */
+		data1_maptag *mt;
+		data1_node *pn = res, *cur = pn->last_child;
+
+		for (mt = m->target_path; mt; mt = mt->next)
+		{
+		    if (!cur || !tagmatch(cur, mt))
+		    {
+			cur = data1_mk_node();
+			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 (!pn->child)
+			    pn->child = cur;
+			if (pn->last_child)
+			    pn->last_child->next = cur;
+			pn->last_child = cur;
+			pn->num_children++;
+		    }
+		    if (mt->next)
+			pn = cur;
+		    else if (!m->no_data)
+		    {
+			cur->child = c->child;
+			cur->num_children = c->num_children;
+			c->child = 0;
+			c->num_children = 0;
+		    }
+		}
+	    }
+	    else if (map_elements(res, c, m) < 0)
+		return -1;
+	}
+    }
+    return 0;
+}
+
+static int map_record(data1_node *res, data1_node *n, data1_maptab *map)
+{
+    data1_mapunit *m;
+
+    for (m = map->map; m; m = m->next)
+	if (map_elements(res, n, m) < 0)
+	    return -1;
+    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;
@@ -309,10 +431,11 @@ 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;
     }
     return res;
 }
+