/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_read.c,v $
- * Revision 1.14 1997-05-14 06:54:04 adam
+ * 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
*
*/
+#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <log.h>
#include <data1.h>
-char *data1_tabpath = 0; /* global path for tables */
-
-void data1_set_tabpath(const char *p)
-{
- if (data1_tabpath)
- {
- xfree (data1_tabpath);
- data1_tabpath = NULL;
- }
- if (p)
- {
- data1_tabpath = xmalloc (strlen(p)+1);
- strcpy (data1_tabpath, p);
- }
-}
-
-const char *data1_get_tabpath (void)
-{
- return data1_tabpath;
-}
-
-#if 0
-static data1_node *freelist = 0;
-#endif
-
/*
* 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)
return 0;
}
-data1_node *data1_mk_node(NMEM m)
+data1_node *data1_mk_node (data1_handle dh, NMEM m)
{
data1_node *r;
-#if 0
- if ((r = freelist))
- freelist = r->next;
- else
- if (!(r = xmalloc(sizeof(*r))))
- abort();
-#else
r = nmem_malloc(m, sizeof(*r));
-#endif
r->next = r->child = r->last_child = r->parent = 0;
- r->num_children = 0;
r->destroy = 0;
return r;
}
-#if 0
-static void fr_node(data1_node *n)
-{
- n->next = freelist;
- freelist = n;
-}
-#endif
-
-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;
}
if (t->destroy)
(*t->destroy)(t);
-#if 0
- fr_node(t);
-#endif
+}
+
+char *data1_insert_string (data1_handle dh, data1_node *res,
+ NMEM m, const char *str)
+{
+ int len = strlen(str);
+
+ if (len > DATA1_LOCALDATA-1)
+ return nmem_strdup (m, str);
+ else
+ {
+ strcpy (res->lbuf, str);
+ return res->lbuf;
+ }
}
/*
* 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, NMEM m)
+data1_node *data1_insert_taggeddata(data1_handle dh, data1_node *root,
+ data1_node *at,
+ char *tagname, NMEM m)
{
- data1_node *tagn = data1_mk_node(m);
+ data1_node *tagn = data1_mk_node (dh, m);
data1_node *datn;
tagn->which = DATA1N_tag;
tagn->u.tag.make_variantlist = 0;
tagn->u.tag.no_data_requested = 0;
tagn->u.tag.get_bytes = -1;
- if (!(tagn->u.tag.element = data1_getelementbytagname(root->u.root.absyn,
- 0, tagname)))
+ if (!(tagn->u.tag.element =
+ data1_getelementbytagname (dh, root->u.root.absyn, 0, tagname)))
return 0;
- tagn->child = datn = data1_mk_node(m);
- tagn->num_children = 1;
+ tagn->child = datn = data1_mk_node (dh, m);
datn->parent = tagn;
datn->root = root;
datn->which = DATA1N_data;
tagn->next = at->child;
tagn->parent = at;
at->child = tagn;
- at->num_children++;
return datn;
}
* 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, NMEM m)
+data1_node *data1_read_node (data1_handle dh, char **buf,
+ data1_node *parent, int *line,
+ data1_absyn *absyn, NMEM m)
{
data1_node *res;
if (**buf == '<') /* beginning of tag */
{
- char *tag = (*buf) + 1;
- char *args = 0;
- char *t = tag;
+ char tag[64];
+ char args[256];
+ int i;
+ 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(m);
+ 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 tclass[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
data1_vartype *tp;
logf(LOG_WARN, "Malformed variant triple at '%s'", tag);
return 0;
}
- if (!(tp = data1_getvartypebyct(parent->root->u.root.absyn->varset,
- tclass, type)))
+ if (!(tp =
+ data1_getvartypebyct(dh, parent->root->u.root.absyn->varset,
+ tclass, type)))
return 0;
/*
*/
if (parent->which != DATA1N_variant)
{
- res = data1_mk_node(m);
+ 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
{
*/
for (p = parent; p->which == DATA1N_variant; p = p->parent)
if (p->u.variant.type == tp)
- {
- *t = '>';
return 0;
- }
-
- res = data1_mk_node(m);
+ 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 /* 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(m);
+ 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->parent = parent;
- res->num_children = 0;
-
pp = &res->child;
/*
* Read child nodes.
*/
- while ((*pp = data1_read_node(buf, res, line, absyn, m)))
+ while ((*pp = data1_read_node(dh, buf, res, line, absyn, m)))
{
res->last_child = *pp;
- res->num_children++;
pp = &(*pp)->next;
}
}
{
int len = 0;
char *data = *buf, *pp = *buf;
-#if 0
- data1_node *partag = get_parent_tag(parent);
-#endif
if (!parent) /* abort if abstract syntax is undefined */
return 0;
+
/* Determine length and remove newlines/extra blanks */
while (**buf && **buf != '<')
{
}
while (isspace(data[len-1]))
len--;
- res = data1_mk_node(m);
+ res = data1_mk_node(dh, m);
res->parent = parent;
res->which = DATA1N_data;
res->u.data.what = DATA1I_text;
+ assert (len >= 0);
res->u.data.len = len;
res->u.data.data = data;
res->u.data.formatted_text = 0;
/*
* Read a record in the native syntax.
*/
-data1_node *data1_read_record(int (*rf)(void *, char *, size_t), void *fh,
+data1_node *data1_read_record(data1_handle dh,
+ int (*rf)(void *, char *, size_t), void *fh,
NMEM m)
{
- static char *buf = 0;
+ int *size;
+ char **buf = data1_get_read_buf (dh, &size);
char *bp;
- static int size;
int rd = 0, res;
int line = 0;
-
- if (!buf && !(buf = xmalloc(size = 4096)))
- abort();
-
+
+ if (!*buf)
+ *buf = xmalloc(*size = 4096);
+
for (;;)
{
- if (rd + 4096 > size && !(buf =xrealloc(buf, size *= 2)))
+ if (rd + 4096 > *size && !(*buf =xrealloc(*buf, *size *= 2)))
abort();
- if ((res = (*rf)(fh, buf + rd, 4096)) <= 0)
+ if ((res = (*rf)(fh, *buf + rd, 4096)) <= 0)
{
if (!res)
{
- bp = buf;
- return data1_read_node(&bp, 0, &line, 0, m);
+ bp = *buf;
+ return data1_read_node(dh, &bp, 0, &line, 0, m);
}
else
return 0;
projects / yaz-moved-to-github.git / blobdiff