X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=17622488d1345701f9dff40b735138aaa1abe5f0;hp=01b1a09b2bfd4718b0d7876cc97eb5a90e60f0a0;hb=7826e2c92b1a07182ba5bfb94c304f1fa7d27387;hpb=3ffa5dbc563e15bccb012f3d3d00a993f87ace82 diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c index 01b1a09..1762248 100644 --- a/retrieval/d1_read.c +++ b/retrieval/d1_read.c @@ -4,7 +4,29 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_read.c,v $ - * Revision 1.3 1995-11-01 16:34:57 quinn + * 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 @@ -71,7 +93,9 @@ char *data1_tabpath = 0; /* global path for tables */ void data1_set_tabpath(char *p) { data1_tabpath = p; } +#if 0 static data1_node *freelist = 0; +#endif /* * get the tag which is the immediate parent of this node (this may mean @@ -85,25 +109,32 @@ data1_node *get_parent_tag(data1_node *n) return 0; } -data1_node *data1_mk_node(void) +data1_node *data1_mk_node(NMEM m) { data1_node *r; +#if 0 if ((r = freelist)) freelist = r->next; else if (!(r = xmalloc(sizeof(*r)))) abort(); - r->next = r->child = r->parent = 0; +#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) { @@ -115,7 +146,11 @@ void data1_free_tree(data1_node *t) data1_free_tree(p); p = pn; } + if (t->destroy) + (*t->destroy)(t); +#if 0 fr_node(t); +#endif } /* @@ -124,26 +159,26 @@ void data1_free_tree(data1_node *t) * which can then be modified. */ data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at, - char *tagname) + char *tagname, NMEM m) { - data1_node *tagn = data1_mk_node(); + data1_node *tagn = data1_mk_node(m); data1_node *datn; tagn->which = DATA1N_tag; tagn->line = -1; tagn->u.tag.tag = 0; tagn->u.tag.node_selected = 0; + tagn->u.tag.make_variantlist = 0; + tagn->u.tag.no_data_requested = 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->child = datn = data1_mk_node(m); tagn->num_children = 1; datn->parent = tagn; datn->root = root; datn->which = DATA1N_data; + datn->u.data.formatted_text = 0; tagn->next = at->child; tagn->parent = at; at->child = tagn; @@ -156,7 +191,7 @@ data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at, * 'node' and its children. */ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, - data1_absyn *absyn) + data1_absyn *absyn, NMEM m) { data1_node *res; @@ -231,7 +266,7 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, tag); return 0; } - res = data1_mk_node(); + res = data1_mk_node(m); res->which = DATA1N_root; res->u.root.type = tag; res->u.root.absyn = absyn; @@ -260,7 +295,7 @@ 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(m); res->which = DATA1N_variant; res->u.variant.type = 0; res->u.variant.value = 0; @@ -283,7 +318,7 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, return 0; } - res = data1_mk_node(); + res = data1_mk_node(m); res->which = DATA1N_variant; res->root = parent->root; res->u.variant.type = tp; @@ -291,7 +326,7 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, *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_element *e = 0; @@ -318,11 +353,13 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, #else elem = data1_getelementbytagname(absyn, e, tag); #endif - res = data1_mk_node(); + res = data1_mk_node(m); res->which = DATA1N_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->root = parent->root; *buf = t + 1; } @@ -334,8 +371,9 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, /* * Read child nodes. */ - while ((*pp = data1_read_node(buf, res, line, absyn))) + while ((*pp = data1_read_node(buf, res, line, absyn, m))) { + res->last_child = *pp; res->num_children++; pp = &(*pp)->next; } @@ -366,46 +404,14 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line, } while (isspace(data[len-1])) len--; - res = data1_mk_node(); + res = data1_mk_node(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}; - - 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))) - { - logf(LOG_WARN, - "Failed to initialize 'wellknown' tag from tagsetM"); - return 0; - } - wk->u.tag.element = &wk_element; - wk->child = partag->child; - if (wk->child) - wk->child->parent = wk; - partag->child = wk; - } -#endif } return res; } @@ -413,7 +419,8 @@ 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(int (*rf)(void *, char *, size_t), void *fh, + NMEM m) { static char *buf = 0; char *bp; @@ -423,16 +430,17 @@ data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd) if (!buf && !(buf = xmalloc(size = 4096))) abort(); + for (;;) { if (rd + 4096 > size && !(buf =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); + return data1_read_node(&bp, 0, &line, 0, m); } else return 0;