X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=0e615e7c4e7a4136e49042e3a98d2b9be96b6176;hp=c951c97dc68aa6b4bf05a6f0579e438b363bd4f3;hb=f69d4aa4609ff3daa71733da1ea0fcd8322ab954;hpb=cea212fba995de3fa0d6d6723d828f6fd7ca31df

diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index c951c97..0e615e7 100644
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -1,10 +1,92 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_read.c,v $
- * Revision 1.1  1995-11-01 11:56:09  quinn
+ * Revision 1.24  1998-10-28 15:10:09  adam
+ * Added --with-yc option to configure. For the data1_node in data1.h:
+ * decreased size of localdata and removed member "line" which wasn't useful.
+ *
+ * Revision 1.23  1998/03/12 11:28:45  adam
+ * Fix: didn't set root member of tagged node in function.
+ * data1_add_insert_taggeddata.
+ *
+ * Revision 1.22  1998/03/05 08:15:32  adam
+ * Implemented data1_add_insert_taggeddata utility which is more flexible
+ * than data1_insert_taggeddata.
+ *
+ * Revision 1.21  1998/02/27 14:08:05  adam
+ * Added const to some char pointer arguments.
+ * Reworked data1_read_node so that it doesn't create a tree with
+ * pointers to original "SGML"-buffer.
+ *
+ * Revision 1.20  1998/02/11 11:53:35  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.19  1997/12/09 16:17:09  adam
+ * Fix bug regarding variants. Tags with prefix "var" was incorrectly
+ * interpreted as "start of variants". Now, only "var" indicates such
+ * start.
+ * Cleaned up data1_read_node so tag names and variant names are
+ * copied and not pointed to by the generated data1 tree. Data nodes
+ * still point to old buffer.
+ *
+ * Revision 1.18  1997/11/18 09:51:09  adam
+ * Removed element num_children from data1_node. Minor changes in
+ * data1 to Explain.
+ *
+ * Revision 1.17  1997/11/05 09:20:51  adam
+ * Minor change.
+ *
+ * Revision 1.16  1997/09/17 12:10:37  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.15  1997/09/05 09:50:57  adam
+ * Removed global data1_tabpath - uses data1_get_tabpath() instead.
+ *
+ * Revision 1.14  1997/05/14 06:54:04  adam
+ * C++ support.
+ *
+ * Revision 1.13  1996/10/29 13:35:38  adam
+ * Implemented data1_set_tabpath and data1_get_tabpath.
+ *
+ * Revision 1.12  1996/10/11 10:35:38  adam
+ * Fixed a bug that caused data1_read_node to core dump when no abstract
+ * syntax was defined in a "sgml"-record.
+ *
+ * Revision 1.11  1996/07/06 19:58:35  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.10  1996/01/19  15:41:47  quinn
+ * Fixed uninitialized boolean.
+ *
+ * Revision 1.9  1996/01/17  14:52:47  adam
+ * Changed prototype for reader function parsed to data1_read_record.
+ *
+ * Revision 1.8  1995/12/15  16:20:41  quinn
+ * Added formatted text.
+ *
+ * Revision 1.7  1995/12/13  13:44:32  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/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
+ * Making data1 look for tables in data1_tabpath
+ *
+ * Revision 1.2  1995/11/01  13:54:48  quinn
+ * Minor adjustments
+ *
+ * Revision 1.1  1995/11/01  11:56:09  quinn
  * Added Retrieval (data management) functions en masse.
  *
  * Revision 1.14  1995/10/30  12:40:55  quinn
@@ -52,21 +134,20 @@
  *
  */
 
+#include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <xmalloc.h>
 #include <log.h>
-#include "data1.h"
-
-static data1_node *freelist = 0;
+#include <data1.h>
 
 /*
  * get the tag which is the immediate parent of this node (this may mean
  * traversing intermediate things like variants and stuff.
  */
-data1_node *get_parent_tag(data1_node *n)
+data1_node *get_parent_tag (data1_handle dh, data1_node *n)
 {
     for (; n && n->which != DATA1N_root; n = n->parent)
 	if (n->which == DATA1N_tag)
@@ -74,78 +155,124 @@ data1_node *get_parent_tag(data1_node *n)
     return 0;
 }
 
-data1_node *data1_mk_node(void)
+data1_node *data1_mk_node (data1_handle dh, NMEM m)
 {
     data1_node *r;
 
-    if ((r = freelist))
-	freelist = r->next;
-    else
-	if (!(r = xmalloc(sizeof(*r))))
-	    abort();
-    r->next = r->child = r->parent = 0;
-    r->num_children = 0;
+    r = (data1_node *)nmem_malloc(m, sizeof(*r));
+    r->next = r->child = r->last_child = r->parent = 0;
+    r->destroy = 0;
     return r;
 }
 
-static void fr_node(data1_node *n)
-{
-    n->next = freelist;
-    freelist = n;
-}
-
-void data1_free_tree(data1_node *t)
+void data1_free_tree (data1_handle dh, data1_node *t)
 {
     data1_node *p = t->child, *pn;
 
     while (p)
     {
 	pn = p->next;
-	data1_free_tree(p);
+	data1_free_tree (dh, p);
 	p = pn;
     }
-    fr_node(t);
+    if (t->destroy)
+	(*t->destroy)(t);
 }
 
-/*
- * Insert a tagged node into the record root as first child of the node at
- * which should be root or tag itself). Returns pointer to the data node,
- * which can then be modified.
- */
-data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at,
-    char *tagname)
+char *data1_insert_string (data1_handle dh, data1_node *res,
+                           NMEM m, const char *str)
 {
-    data1_node *tagn = data1_mk_node();
+    int len = strlen(str);
+
+    if (len >= DATA1_LOCALDATA)
+        return nmem_strdup (m, str);
+    else
+    {
+        strcpy (res->lbuf, str);
+	return res->lbuf;
+    }
+}
+
+
+data1_node *data1_add_insert_taggeddata(data1_handle dh, data1_node *root,
+					data1_node *at,
+					const char *tagname, NMEM m,
+					int first_flag, int local_allowed)
+{
+    data1_node *partag = get_parent_tag (dh, at);
+    data1_node *tagn = data1_mk_node (dh, m);
+    data1_element *e = NULL;
     data1_node *datn;
 
     tagn->which = DATA1N_tag;
-    tagn->line = -1;
-    tagn->u.tag.tag = 0;
+    tagn->u.tag.tag = data1_insert_string (dh, tagn, m, tagname);
     tagn->u.tag.node_selected = 0;
-    if (!(tagn->u.tag.element = data1_getelementbytagname(root->u.root.absyn,
-	0, tagname)))
-    {
-	fr_node(tagn);
-	return 0;
-    }
-    tagn->child = datn = data1_mk_node();
-    tagn->num_children = 1;
+    tagn->u.tag.make_variantlist = 0;
+    tagn->u.tag.no_data_requested = 0;
+    tagn->u.tag.get_bytes = -1;
+
+    if (partag)
+	e = partag->u.tag.element;
+    tagn->u.tag.element =
+	data1_getelementbytagname (dh, root->u.root.absyn, e, tagname);
+    if (!local_allowed && !tagn->u.tag.element)
+	return NULL;
+    tagn->last_child = tagn->child = datn = data1_mk_node (dh, m);
+    tagn->root = root;
     datn->parent = tagn;
     datn->root = root;
     datn->which = DATA1N_data;
-    tagn->next = at->child;
+    datn->u.data.formatted_text = 0;
     tagn->parent = at;
-    at->child = tagn;
-    at->num_children++;
+
+    if (first_flag)
+    {
+	tagn->next = at->child;
+	if (!tagn->next)
+	    at->last_child = tagn;
+	at->child = tagn;
+    }
+    else
+    {
+	if (!at->child)
+	    at->child = tagn;
+	else
+	{
+	    assert (at->last_child);
+	    at->last_child->next = tagn;
+	}
+	at->last_child = tagn;
+    }
     return datn;
 }
 
+data1_node *data1_add_taggeddata(data1_handle dh, data1_node *root,
+				 data1_node *at,
+				 const char *tagname, NMEM m)
+{
+    return data1_add_insert_taggeddata (dh, root, at, tagname, m, 0, 1);
+}
+
+
+/*
+ * Insert a tagged node into the record root as first child of the node at
+ * which should be root or tag itself). Returns pointer to the data node,
+ * which can then be modified.
+ */
+data1_node *data1_insert_taggeddata(data1_handle dh, data1_node *root,
+				    data1_node *at,
+				    const char *tagname, NMEM m)
+{
+    return data1_add_insert_taggeddata (dh, root, at, tagname, m, 1, 0);
+}
+
 /*
  * Ugh. Sometimes functions just grow and grow on you. This one reads a
  * 'node' and its children.
  */
-data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
-    data1_absyn *absyn)
+data1_node *data1_read_node (data1_handle dh, const char **buf,
+			     data1_node *parent, int *line,
+			     data1_absyn *absyn, NMEM m)
 {
     data1_node *res;
 
@@ -160,87 +287,72 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 
     if (**buf == '<') /* beginning of tag */
     {
-	char *tag = (*buf) + 1;
-	char *args = 0;
-	char *t = tag;
+	char tag[64];
+	char args[256];
+	int i;
+	const char *t = (*buf) + 1;
 	data1_node **pp;
 	data1_element *elem = 0;
-
-	for (; *t && *t != '>' && !isspace(*t); t++);
+	
+	for (i = 0; *t && *t != '>' && !isspace(*t); t++)
+	    if (i < (sizeof(tag)-1))
+		tag[i++] = *t;
+	tag[i] = '\0';
+	while (isspace(*t))
+	    t++;
+	for (i = 0; *t && *t != '>'; t++)
+	    if (i < (sizeof(args)-1))
+		args[i++] = *t;
+	args[i] = '\0';
 	if (*t != '>' && !isspace(*t))
 	{
 	    logf(LOG_WARN, "d1: %d: Malformed tag", *line);
 	    return 0;
 	}
-	if (isspace(*t)) /* the tag has arguments */
-	{
-	    while (isspace(*t))
-		t++;
-	    if (*t != '>')
-	    {
-		args = t;
-		for (; *t && *t != '>'; t++);
-		if (*t != '>' && !isspace(*t))
-		{
-		    logf(LOG_WARN, "d1: %d: Malformed tag", *line);
-		    return 0;
-		}
-	    }
-	}
-
 	/*
 	 * if end-tag, see if we terminate parent. If so, consume and return.
 	 * Else, return.
 	 */
-	*t = '\0';
 	if (*tag == '/')
 	{
-	    if (!parent)
-		return 0;
-	    if (!*(tag +1) || (parent->which == DATA1N_root && !strcmp(tag + 1,
-		parent->u.root.type)) ||
-		(parent->which == DATA1N_tag && !strcmp(tag + 1,
-		parent->u.tag.tag)))
-	    {
+	    if (parent && (!*(tag +1) ||
+		    (parent->which == DATA1N_root &&
+		     !strcmp(tag + 1,parent->u.root.type)) ||
+		    (parent->which == DATA1N_tag &&
+		     !strcmp(tag + 1, parent->u.tag.tag))))
 		*buf = t + 1;
-		return 0;
-	    }
-	    else
-	    {
-		*t = '>';
-		return 0;
-	    }
-	}
-
+	    return 0;
+	}	
 	if (!absyn) /* parent node - what are we? */
 	{
-	    if (!(absyn = data1_get_absyn(tag)))
+	    if (!(absyn = data1_get_absyn (dh, tag)))
 	    {
 		logf(LOG_WARN, "Unable to acquire abstract syntax for '%s'",
 		    tag);
 		return 0;
 	    }
-	    res = data1_mk_node();
+	    res = data1_mk_node (dh, m);
 	    res->which = DATA1N_root;
-	    res->u.root.type = tag;
+	    res->u.root.type = data1_insert_string (dh, res, m, tag);
 	    res->u.root.absyn = absyn;
 	    res->root = res;
 	    *buf = t + 1;
 	}
-	else if (!strncmp(tag, "var", 3))
+	else if (!strcmp(tag, "var"))
 	{
-	    char class[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
+	    char tclass[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
 	    data1_vartype *tp;
 	    int val_offset;
 	    data1_node *p;
 
-	    if (sscanf(args, "%s %s %n", class, type, &val_offset) != 2)
+	    if (sscanf(args, "%s %s %n", tclass, type, &val_offset) != 2)
 	    {
 		logf(LOG_WARN, "Malformed variant triple at '%s'", tag);
 		return 0;
 	    }
-	    if (!(tp = data1_getvartypebyct(parent->root->u.root.absyn->varset,
-		class, type)))
+	    if (!(tp =
+		  data1_getvartypebyct(dh, parent->root->u.root.absyn->varset,
+				       tclass, type)))
 		return 0;
 	    
 	    /*
@@ -249,12 +361,11 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 	     */
 	    if (parent->which != DATA1N_variant)
 	    {
-		res = data1_mk_node();
+		res = data1_mk_node (dh, m);
 		res->which = DATA1N_variant;
 		res->u.variant.type = 0;
 		res->u.variant.value = 0;
 		res->root = parent->root;
-		*t = '>';
 	    }
 	    else
 	    {
@@ -267,134 +378,101 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 		 */
 		for (p = parent; p->which == DATA1N_variant; p = p->parent)
 		    if (p->u.variant.type == tp)
-		    {
-			*t = '>';
 			return 0;
-		    }
-
-		res =  data1_mk_node();
+		res =  data1_mk_node (dh, m);
 		res->which = DATA1N_variant;
 		res->root = parent->root;
 		res->u.variant.type = tp;
-		res->u.variant.value = args + val_offset;
+	        res->u.variant.value =
+                    data1_insert_string (dh, res, m, args + val_offset);
 		*buf = t + 1;
 	    }
 	}
-	else /* acquire our element in the abstract syntax */
+	else /* tag.. acquire our element in the abstract syntax */
 	{
-	    data1_node *partag = get_parent_tag(parent);
+	    data1_node *partag = get_parent_tag (dh, parent);
 	    data1_element *e = 0;
 	    int localtag = 0;
 
 	    if (parent->which == DATA1N_variant)
-	    {
-		*t = '>';
 		return 0;
-	    }
 	    if (partag)
 		if (!(e = partag->u.tag.element))
 		    localtag = 1; /* our parent is a local tag */
 
-#if 0
-	    if (!localtag && !(elem = data1_getelementbytagname(absyn,
-		e, tag)) && (data1_gettagbyname(absyn->tagset, tag)))
-	    {
-		if (parent->which == DATA1N_root)
-		    logf(LOG_WARN, "Tag '%s' used out of context", tag);
-		*t = '>';
-		return 0;
-	    }
-#else
-	    elem = data1_getelementbytagname(absyn, e, tag);
-#endif
-	    res = data1_mk_node();
+	    elem = data1_getelementbytagname(dh, absyn, e, tag);
+	    res = data1_mk_node (dh, m);
 	    res->which = DATA1N_tag;
+            res->u.tag.tag = data1_insert_string (dh, res, m, tag);
 	    res->u.tag.element = elem;
-	    res->u.tag.tag = tag;
 	    res->u.tag.node_selected = 0;
+	    res->u.tag.make_variantlist = 0;
+	    res->u.tag.no_data_requested = 0;
+	    res->u.tag.get_bytes = -1;
 	    res->root = parent->root;
 	    *buf = t + 1;
 	}
 
 	res->parent = parent;
-	res->num_children = 0;
-
 	pp = &res->child;
 	/*
 	 * Read child nodes.
 	 */
-	while ((*pp = data1_read_node(buf, res, line, absyn)))
+	while ((*pp = data1_read_node(dh, buf, res, line, absyn, m)))
 	{
-	    res->num_children++;
+	    res->last_child = *pp;
 	    pp = &(*pp)->next;
 	}
     }
     else /* != '<'... this is a body of text */
     {
-	int len = 0;
-	char *data = *buf, *pp = *buf;
-#if 0
-	data1_node *partag = get_parent_tag(parent);
-#endif
+	const char *src;
+	char *dst;
+	int len, prev_char = 0;
 
-	/* Determine length and remove newlines/extra blanks */
-	while (**buf && **buf != '<')
-	{
-	    if (**buf == '\n')
-		(*line)++;
-	    if (isspace(**buf))
-	    {
-		*(pp++) = ' ';
-		(*buf)++;
-		while (isspace(**buf))
-		    (*buf)++;
-	    }
-	    else
-		*(pp++) = *((*buf)++);
-	    len++;
-	}
-	while (isspace(data[len-1]))
-	    len--;
-	res = data1_mk_node();
+	if (!parent)
+	    return 0;
+
+	res = data1_mk_node(dh, m);
 	res->parent = parent;
 	res->which = DATA1N_data;
 	res->u.data.what = DATA1I_text;
-	res->u.data.len = len;
-	res->u.data.data = data;
+	res->u.data.formatted_text = 0;
 	res->root = parent->root;
 
-	/*
-	 * if the parent is structured, we'll insert a 'wellKnown' marker
-	 * in front of the data.
-	 */
-#if 0
-	if (partag->u.tag.element && partag->u.tag.element->tag->kind ==
-	    DATA1K_structured)
-	{
-	    data1_node *wk = mk_node();
-	    static data1_element wk_element = { 0, 0, 0, 0, 0};
+	/* determine length of "data" */
+	src = strchr (*buf, '<');
+	if (src)
+	    len = src - *buf;
+	else
+	    len = strlen (*buf);
 
-	    wk->parent = partag;
-	    wk->root = partag->root;
-	    wk->which = DATA1N_tag;
-	    wk->u.tag.tag = 0;
-	    /*
-	     * get well-known tagdef if required.
-	     */
-	    if (!wk_element.tag && !(wk_element.tag =
-		data1_gettagbynum(wk->root->u.root.absyn->tagset, 1, 19)))
+	/* use local buffer of nmem if too large */
+	if (len >= DATA1_LOCALDATA)
+	    res->u.data.data = (char*) nmem_malloc (m, len);
+	else
+	    res->u.data.data = res->lbuf;
+
+	/* read "data" and transfer while removing white space */
+	dst = res->u.data.data;
+	for (src = *buf; --len >= 0; src++)
+	{
+	    if (*src == '\n')
+		(*line)++;
+	    if (isspace (*src))
+		prev_char = ' ';
+	    else
+	    {
+		if (prev_char)
 		{
-		    logf(LOG_WARN,
-			"Failed to initialize 'wellknown' tag from tagsetM");
-		    return 0;
+		    *dst++ = prev_char;
+		    prev_char = 0;
 		}
-	    wk->u.tag.element = &wk_element;
-	    wk->child = partag->child;
-	    if (wk->child)
-		wk->child->parent = wk;
-	    partag->child = wk;
+		*dst++ = *src;
+	    }
 	}
-#endif
+	*buf = src;
+	res->u.data.len = dst - res->u.data.data;
     }
     return res;
 }
@@ -402,26 +480,29 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 /*
  * Read a record in the native syntax.
  */
-data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd)
+data1_node *data1_read_record(data1_handle dh,
+			      int (*rf)(void *, char *, size_t), void *fh,
+                              NMEM m)
 {
-    static char *buf = 0;
-    char *bp;
-    static int size;
+    int *size;
+    char **buf = data1_get_read_buf (dh, &size);
+    const char *bp;
     int rd = 0, res;
     int line = 0;
-
-    if (!buf && !(buf = xmalloc(size = 4096)))
-	abort();
+    
+    if (!*buf)
+	*buf = (char *)xmalloc(*size = 4096);
+    
     for (;;)
     {
-	if (rd + 4096 > size && !(buf = realloc(buf, size *= 2)))
+	if (rd + 4096 > *size && !(*buf =(char *)xrealloc(*buf, *size *= 2)))
 	    abort();
-	if ((res = (*rf)(fd, buf + rd, 4096)) <= 0)
+	if ((res = (*rf)(fh, *buf + rd, 4096)) <= 0)
 	{
 	    if (!res)
 	    {
-		bp = buf;
-		return data1_read_node(&bp, 0, &line, 0);
+		bp = *buf;
+		return data1_read_node(dh, &bp, 0, &line, 0, m);
 	    }
 	    else
 		return 0;
@@ -429,3 +510,10 @@ data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd)
 	rd += res;
     }
 }
+
+data1_node *data1_read_sgml (data1_handle dh, NMEM m, const char *buf)
+{
+    const char *bp = buf;
+    int line = 0;
+    return data1_read_node (dh, &bp, 0, &line, 0, m);
+}