From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 11 Dec 1995 15:22:37 +0000 (+0000)
Subject: Added last_child field to the node.
X-Git-Tag: YAZ.1.8~848
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=378fb34b7013a9f6b15fd632f987a339da80b907

Added last_child field to the node.
Rewrote schema-mapping.
---

diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c
index d508330..98d6b8b 100644
--- a/retrieval/d1_map.c
+++ b/retrieval/d1_map.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_map.c,v $
- * Revision 1.3  1995-11-01 16:34:56  quinn
+ * 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
@@ -113,7 +117,6 @@ data1_maptab *data1_read_maptab(char *file)
 	    {
 		int type, np;
 		char valstr[512], parm[512];
-		int numval;
 
 		if (ep)
 		    ep++;
@@ -158,6 +161,8 @@ data1_maptab *data1_read_maptab(char *file)
     return res;
 }
 
+#if 0
+
 /*
  * Locate node with givel elementname.
  * NOTE: This is stupid - we don't find repeats this way.
@@ -294,6 +299,113 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res)
     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;
+}
+
 /*
  * 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,
@@ -313,10 +425,12 @@ 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_record(res, n, map) < 0)
     {
 	data1_free_tree(res);
 	return 0;
     }
     return res;
 }
+
+#endif
diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index 910fa0e..66295acb1 100644
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -4,7 +4,11 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_read.c,v $
- * Revision 1.4  1995-11-13 09:27:36  quinn
+ * Revision 1.5  1995-12-11 15:22:37  quinn
+ * Added last_child field to the node.
+ * Rewrote schema-mapping.
+ *
+ * Revision 1.4  1995/11/13  09:27:36  quinn
  * Fiddling with the variant stuff.
  *
  * Revision 1.3  1995/11/01  16:34:57  quinn
@@ -97,7 +101,7 @@ data1_node *data1_mk_node(void)
     else
 	if (!(r = xmalloc(sizeof(*r))))
 	    abort();
-    r->next = r->child = r->parent = 0;
+    r->next = r->child = r->last_child = r->parent = 0;
     r->num_children = 0;
     return r;
 }
@@ -343,6 +347,7 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 	 */
 	while ((*pp = data1_read_node(buf, res, line, absyn)))
 	{
+	    res->last_child = *pp;
 	    res->num_children++;
 	    pp = &(*pp)->next;
 	}