-/* $Id: d1_read.c,v 1.3 2003-02-28 12:33:38 oleg Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
- * This module reads "loose" SGML and converts it to data1 tree
+ * This module reads "loose" SGML and converts it to data1 tree
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
-#include <yaz/xmalloc.h>
#include <yaz/yaz-util.h>
-#include <yaz/log.h>
-#include <data1.h>
+#include <d1_absyn.h>
data1_node *data1_get_root_tag (data1_handle dh, data1_node *n)
{
}
return n;
}
-
+
/*
* get the tag which is the immediate parent of this node (this may mean
* traversing intermediate things like variants and stuff.
r->u.preprocess.attributes = 0;
break;
default:
- logf (LOG_WARN, "data_mk_node_type. bad type = %d\n", type);
+ yaz_log (YLOG_WARN, "data_mk_node_type. bad type = %d\n", type);
}
}
{
data1_node *r = (data1_node *)nmem_malloc(m, sizeof(*r));
r->next = r->child = r->last_child = 0;
- r->destroy = 0;
-
+
+ r->parent = parent;
if (!parent)
r->root = r;
else
{
r->root = parent->root;
- r->parent = parent;
if (!parent->child)
parent->child = parent->last_child = r;
else
{
data1_node *r = (data1_node *)nmem_malloc(m, sizeof(*r));
r->next = r->child = r->last_child = 0;
- r->destroy = 0;
-
+
if (!parent)
r->root = r;
else
return r;
}
-void data1_free_tree (data1_handle dh, data1_node *t)
-{
- data1_node *p = t->child, *pn;
-
- while (p)
- {
- pn = p->next;
- data1_free_tree (dh, p);
- p = pn;
- }
- if (t->destroy)
- (*t->destroy)(t);
-}
-
data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
{
- data1_absyn *absyn = data1_get_absyn (dh, name);
+ data1_absyn *absyn = data1_get_absyn(dh, name, 1);
data1_node *res;
+
if (!absyn)
{
- yaz_log(LOG_WARN, "Unable to acquire abstract syntax " "for '%s'",
- name);
+ yaz_log(YLOG_WARN, "Unable to acquire abstract syntax " "for '%s'",
+ name);
/* It's now OK for a record not to have an absyn */
}
res = data1_mk_node2 (dh, nmem, DATA1N_root, 0);
void data1_set_root(data1_handle dh, data1_node *res,
NMEM nmem, const char *name)
{
- data1_absyn *absyn = data1_get_absyn (dh, name);
+ data1_absyn *absyn = data1_get_absyn(
+ dh, name, DATA1_XPATH_INDEXING_ENABLE);
res->u.root.type = data1_insert_string (dh, res, nmem, name);
res->u.root.absyn = absyn;
}
+void data1_add_attrs(data1_handle dh, NMEM nmem, const char **attr,
+ data1_xattr **p)
+{
+ while (*p)
+ p = &(*p)->next;
+
+ while (attr && *attr)
+ {
+ *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
+ (*p)->name = nmem_strdup (nmem, *attr++);
+ (*p)->value = nmem_strdup (nmem, *attr++);
+ (*p)->what = DATA1I_text;
+
+ p = &(*p)->next;
+ }
+ *p = 0;
+}
+
data1_node *data1_mk_preprocess (data1_handle dh, NMEM nmem,
const char *target,
const char **attr, data1_node *at)
const char *target, size_t len,
const char **attr, data1_node *at)
{
- data1_xattr **p;
data1_node *res = data1_mk_node2 (dh, nmem, DATA1N_preprocess, at);
res->u.preprocess.target = data1_insert_string_n (dh, res, nmem,
target, len);
-
- p = &res->u.preprocess.attributes;
- while (attr && *attr)
- {
- *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
- (*p)->name = nmem_strdup (nmem, *attr++);
- (*p)->value = nmem_strdup (nmem, *attr++);
- (*p)->what = DATA1I_text;
- p = &(*p)->next;
- }
- *p = 0;
+ data1_add_attrs(dh, nmem, attr, &res->u.preprocess.attributes);
+ return res;
+}
+
+data1_node *data1_insert_preprocess (data1_handle dh, NMEM nmem,
+ const char *target,
+ const char **attr, data1_node *at)
+{
+ return data1_insert_preprocess_n (dh, nmem, target, strlen(target),
+ attr, at);
+}
+
+data1_node *data1_insert_preprocess_n (data1_handle dh, NMEM nmem,
+ const char *target, size_t len,
+ const char **attr, data1_node *at)
+{
+ data1_node *res = data1_insert_node (dh, nmem, DATA1N_preprocess, at);
+ res->u.preprocess.target = data1_insert_string_n (dh, res, nmem,
+ target, len);
+
+ data1_add_attrs(dh, nmem, attr, &res->u.preprocess.attributes);
return res;
}
-data1_node *data1_mk_tag_n (data1_handle dh, NMEM nmem,
+data1_node *data1_mk_tag_n (data1_handle dh, NMEM nmem,
const char *tag, size_t len, const char **attr,
data1_node *at)
{
data1_node *partag = get_parent_tag(dh, at);
data1_node *res = data1_mk_node2 (dh, nmem, DATA1N_tag, at);
- data1_xattr **p;
data1_element *e = 0;
-
+
res->u.tag.tag = data1_insert_string_n (dh, res, nmem, tag, len);
-
+
if (!partag) /* top tag? */
e = data1_getelementbytagname (dh, at->root->u.root.absyn,
0 /* index as local */,
e, res->u.tag.tag);
}
res->u.tag.element = e;
- p = &res->u.tag.attributes;
- while (attr && *attr)
- {
- *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
- (*p)->name = nmem_strdup (nmem, *attr++);
- (*p)->value = nmem_strdup (nmem, *attr++);
- (*p)->what = DATA1I_text;
- p = &(*p)->next;
- }
- *p = 0;
+ data1_add_attrs(dh, nmem, attr, &res->u.tag.attributes);
return res;
}
void data1_tag_add_attr (data1_handle dh, NMEM nmem,
data1_node *res, const char **attr)
{
- data1_xattr **p;
-
if (res->which != DATA1N_tag)
return;
- p = &res->u.tag.attributes;
- while (*p)
- p = &(*p)->next;
-
- while (attr && *attr)
- {
- *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
- (*p)->name = nmem_strdup (nmem, *attr++);
- (*p)->value = nmem_strdup (nmem, *attr++);
- (*p)->what = DATA1I_text;
- p = &(*p)->next;
- }
- *p = 0;
+ data1_add_attrs(dh, nmem, attr, &res->u.tag.attributes);
}
data1_node *data1_mk_tag (data1_handle dh, NMEM nmem,
- const char *tag, const char **attr, data1_node *at)
+ const char *tag, const char **attr, data1_node *at)
{
return data1_mk_tag_n (dh, nmem, tag, strlen(tag), attr, at);
}
return 0;
}
-data1_node *data1_mk_tag_uni (data1_handle dh, NMEM nmem,
+data1_node *data1_mk_tag_uni (data1_handle dh, NMEM nmem,
const char *tag, data1_node *at)
{
data1_node *node = data1_search_tag (dh, at->child, tag);
data1_node *res = data1_mk_node2 (dh, mem, DATA1N_data, parent);
res->u.data.what = DATA1I_text;
res->u.data.len = len;
-
+
res->u.data.data = data1_insert_string_n (dh, res, mem, buf, len);
return res;
}
data1_node *res = data1_mk_node2 (dh, mem, DATA1N_comment, parent);
res->u.data.what = DATA1I_text;
res->u.data.len = len;
-
+
res->u.data.data = data1_insert_string_n (dh, res, mem, buf, len);
return res;
}
if (!partag)
e = data1_getelementbytagname (dh, root->u.root.absyn, 0, tagname);
- else
+ else
{
e = partag->u.tag.element;
if (e)
return data1_add_insert_taggeddata (dh, at, tagname, m, 1, 0);
}
-data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
- const char *tag, int num,
+data1_node *data1_mk_tag_data_zint (data1_handle dh, data1_node *at,
+ const char *tag, zint num,
NMEM nmem)
{
data1_node *node_data;
-
+
node_data = data1_mk_tag_data (dh, at, tag, nmem);
if (!node_data)
return 0;
node_data->u.data.what = DATA1I_num;
node_data->u.data.data = node_data->lbuf;
- sprintf (node_data->u.data.data, "%d", num);
+ sprintf (node_data->u.data.data, ZINT_FORMAT, num);
node_data->u.data.len = strlen (node_data->u.data.data);
return node_data;
}
+data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
+ const char *tag, int num,
+ NMEM nmem)
+{
+ return data1_mk_tag_data_zint(dh, at, tag, num, nmem);
+}
+
data1_node *data1_mk_tag_data_oid (data1_handle dh, data1_node *at,
const char *tag, Odr_oid *oid,
NMEM nmem)
data1_node *node_data;
char str[128], *p = str;
Odr_oid *ii;
-
+
node_data = data1_mk_tag_data (dh, at, tag, nmem);
if (!node_data)
return 0;
-
+
for (ii = oid; *ii >= 0; ii++)
{
if (ii != oid)
NMEM nmem)
{
data1_node *node_data;
-
+
node_data = data1_mk_tag_data (dh, at, tag, nmem);
if (!node_data)
return 0;
{
char ent[20];
int i = 0;
-
+
while (1)
{
c = (*get_byte)(fh);
if (c == ';')
{
ent[i] = 0;
-
+
c = ' ';
if (!strcmp (ent, "quot"))
c = '"';
for (;;)
{
data1_xattr *p;
- int len;
while (*amp || (c && d1_isspace(c)))
c = ampr (get_byte, fh, amp);
if (*amp == 0 && (c == 0 || c == '>' || c == '/'))
pp = &p->next;
p->value = 0;
p->what = DATA1I_xmltext;
-
+
wrbuf_rewind(wrbuf);
while (c && c != '=' && c != '>' && c != '/' && !d1_isspace(c))
{
wrbuf_putc (wrbuf, c);
c = ampr (get_byte, fh, amp);
}
- wrbuf_putc (wrbuf, '\0');
- len = wrbuf_len(wrbuf);
- p->name = (char*) nmem_malloc (m, len);
- strcpy (p->name, wrbuf_buf(wrbuf));
+ p->name = nmem_strdup (m, wrbuf_cstr(wrbuf));
if (c == '=')
{
c = ampr (get_byte, fh, amp);
if (*amp == 0 && c == '"')
{
- c = ampr (get_byte, fh, amp);
+ c = ampr (get_byte, fh, amp);
wrbuf_rewind(wrbuf);
while (*amp || (c && c != '"'))
{
}
else if (*amp == 0 && c == '\'')
{
- c = ampr (get_byte, fh, amp);
+ c = ampr (get_byte, fh, amp);
wrbuf_rewind(wrbuf);
while (*amp || (c && c != '\''))
{
c = ampr (get_byte, fh, amp);
}
}
- wrbuf_putc (wrbuf, '\0');
- len = wrbuf_len(wrbuf);
- p->value = (char*) nmem_malloc (m, len);
- strcpy (p->value, wrbuf_buf(wrbuf));
+ p->value = nmem_strdup(m, wrbuf_cstr(wrbuf));
}
}
*ch = c;
{
data1_xattr *xattr;
- char tag[64];
- char args[256];
+ char tag[256];
int null_tag = 0;
int end_tag = 0;
size_t i = 0;
end_tag = 1;
c = ampr (get_byte, fh, &);
}
+ else if (amp == 0 && c == '?')
+ {
+ int quote_mode = 0;
+ while ((c = ampr(get_byte, fh, &)))
+ {
+ if (amp)
+ continue;
+ if (quote_mode == 0)
+ {
+ if (c == '"')
+ quote_mode = c;
+ else if (c == '\'')
+ quote_mode = c;
+ else if (c == '>')
+ {
+ c = ampr(get_byte, fh, &);
+ break;
+ }
+ }
+ else
+ {
+ if (amp == 0 && c == quote_mode)
+ quote_mode = 0;
+ }
+ }
+ continue;
+ }
else if (amp == 0 && c == '!')
{
int c0, amp0;
-
+
wrbuf_rewind(wrbuf);
-
+
c0 = ampr (get_byte, fh, &0);
if (amp0 == 0 && c0 == '\0')
break;
c = ampr (get_byte, fh, &);
-
+
if (amp0 == 0 && c0 == '-' && amp == 0 && c == '-')
{
/* COMMENT: <!-- ... --> */
int no_dash = 0;
-
+
c = ampr (get_byte, fh, &);
while (amp || c)
{
else if (amp == 0 && c == '>' && no_dash >= 2)
{
if (level > 0)
- d1_stack[level] =
+ d1_stack[level] =
data1_mk_comment_n (
dh, m,
wrbuf_buf(wrbuf), wrbuf_len(wrbuf)-2,
}
else
{ /* DIRECTIVE: <! .. > */
-
+
int blevel = 0;
while (amp || c)
{
}
tag[i] = '\0';
xattr = data1_read_xattr (dh, m, get_byte, fh, wrbuf, &c, &);
- args[0] = '\0';
if (amp == 0 && c == '/')
{ /* <tag attrs/> or <tag/> */
null_tag = 1;
}
if (amp || c != '>')
{
- yaz_log(LOG_WARN, "d1: %d: Malformed tag", line);
+ yaz_log(YLOG_WARN, "d1: %d: Malformed tag", line);
return 0;
}
else
c = ampr (get_byte, fh, &);
/* End tag? */
- if (end_tag)
+ if (end_tag)
{
if (*tag == '\0')
--level; /* </> */
}
if (i != level)
{
- yaz_log (LOG_WARN, "%d: no begin tag for %s",
+ yaz_log (YLOG_WARN, "%d: no begin tag for %s",
line, tag);
break;
}
return d1_stack[0];
}
continue;
- }
- else if (!strcmp(tag, "var"))
+ }
+ else if (!strcmp(tag, "var")
+ && xattr && xattr->next && xattr->next->next
+ && xattr->value == 0
+ && xattr->next->value == 0
+ && xattr->next->next->value == 0)
{
- char tclass[DATA1_MAX_SYMBOL], type[DATA1_MAX_SYMBOL];
+ /* <var class type value> */
+ const char *tclass = xattr->name;
+ const char *type = xattr->next->name;
+ const char *value = xattr->next->name;
data1_vartype *tp;
- int val_offset;
-
- if (sscanf(args, "%s %s %n", tclass, type, &val_offset) != 2)
- {
- yaz_log(LOG_WARN, "Malformed variant triple at '%s'", tag);
- continue;
- }
+
+ yaz_log(YLOG_LOG, "Variant class=%s type=%s value=%s",
+ tclass, type, value);
if (!(tp =
data1_getvartypebyct(dh,
parent->root->u.root.absyn->varset,
tclass, type)))
continue;
/*
- * If we're the first variant in this group, create a parent
+ * If we're the first variant in this group, create a parent
* variant, and insert it before the current variant.
*/
if (parent->which != DATA1N_variant)
res = data1_mk_node2 (dh, m, DATA1N_variant, parent);
res->u.variant.type = tp;
res->u.variant.value =
- data1_insert_string (dh, res, m, args + val_offset);
+ data1_insert_string (dh, res, m, value);
}
}
- else
+ else
{
-
+
/* tag .. acquire our element in the abstract syntax */
if (level == 0)
{
else /* != '<'... this is a body of text */
{
int len;
-
+
if (level == 0)
{
c = ampr (get_byte, fh, &);
res->u.data.what = DATA1I_xmltext;
res->u.data.formatted_text = 0;
d1_stack[level] = res;
-
+
wrbuf_rewind(wrbuf);
while (amp || (c && c != '<'))
res->u.data.data = (char*) nmem_malloc (m, len);
else
res->u.data.data = res->lbuf;
-
+
if (len)
memcpy (res->u.data.data, wrbuf_buf(wrbuf), len);
else
data1_node *node;
node = data1_read_nodex(dh, m, getc_mem, (void *) (buf), wrbuf);
- wrbuf_free (wrbuf, 1);
+ wrbuf_destroy(wrbuf);
return node;
}
char **buf = data1_get_read_buf (dh, &size);
const char *bp;
int rd = 0, res;
-
+
if (!*buf)
*buf = (char *)xmalloc(*size = 4096);
-
+
for (;;)
{
if (rd + 2048 >= *size && !(*buf =(char *)xrealloc(*buf, *size *= 2)))
}
-static int conv_item (NMEM m, yaz_iconv_t t,
- WRBUF wrbuf, char *inbuf, size_t inlen)
+static int conv_item(NMEM m, yaz_iconv_t t,
+ WRBUF wrbuf, char *inbuf, size_t inlen)
{
- wrbuf_rewind (wrbuf);
- if (wrbuf->size < 10)
- wrbuf_grow (wrbuf, 10);
- for (;;)
- {
- char *outbuf = wrbuf->buf + wrbuf->pos;
- size_t outlen = wrbuf->size - wrbuf->pos;
- if (yaz_iconv (t, &inbuf, &inlen, &outbuf, &outlen) ==
- (size_t)(-1) && yaz_iconv_error(t) != YAZ_ICONV_E2BIG)
- {
- /* bad data. stop and skip conversion entirely */
- return -1;
- }
- else if (inlen == 0)
- { /* finished converting */
- wrbuf->pos = wrbuf->size - outlen;
- break;
- }
- else
- {
- /* buffer too small: make sure we expand buffer */
- wrbuf->pos = wrbuf->size - outlen;
- wrbuf_grow(wrbuf, 20);
- }
- }
+ wrbuf_rewind(wrbuf);
+ wrbuf_iconv_write(wrbuf, t, inbuf, inlen);
+ wrbuf_iconv_reset(wrbuf, t);
return 0;
}
== 0)
{
n->u.tag.tag =
- data1_insert_string_n (dh, n, m,
+ data1_insert_string_n (dh, n, m,
wrbuf->buf, wrbuf->pos);
}
if (n->u.tag.attributes)
conv_item(m, t, wrbuf, p->value, strlen(p->value))
== 0)
{
- wrbuf_puts (wrbuf, "");
- p->value = nmem_strdup (m, wrbuf->buf);
+ p->value = nmem_strdup(m, wrbuf_cstr(wrbuf));
}
}
}
}
int data1_iconv (data1_handle dh, NMEM m, data1_node *n,
- const char *tocode,
- const char *fromcode)
+ const char *tocode,
+ const char *fromcode)
{
if (yaz_matchstr (tocode, fromcode))
{
WRBUF wrbuf = wrbuf_alloc();
- yaz_iconv_t t = yaz_iconv_open (tocode, fromcode);
+ yaz_iconv_t t = yaz_iconv_open(tocode, fromcode);
if (!t)
+ {
+ wrbuf_destroy(wrbuf);
return -1;
- data1_iconv_s (dh, m, n, t, wrbuf, tocode);
- yaz_iconv_close (t);
- wrbuf_free (wrbuf, 1);
+ }
+ data1_iconv_s(dh, m, n, t, wrbuf, tocode);
+ yaz_iconv_close(t);
+ wrbuf_destroy(wrbuf);
}
return 0;
}
+
+void data1_chop_text(data1_handle dh, NMEM m, data1_node *n)
+{
+ for (; n; n = n->next)
+ {
+ if (n->which == DATA1N_data)
+ {
+
+ int sz = n->u.data.len;
+ const char *ndata = n->u.data.data;
+ int off = 0;
+
+ for (off = 0; off < sz; off++)
+ if (!d1_isspace(ndata[off]))
+ break;
+ sz = sz - off;
+ ndata += off;
+
+ while (sz && d1_isspace(ndata[sz - 1]))
+ sz--;
+
+ n->u.data.data = nmem_malloc(m, sz);
+ n->u.data.len = sz;
+ memcpy(n->u.data.data, ndata, sz);
+
+ }
+ data1_chop_text(dh, m, n->child);
+ }
+}
+
+void data1_concat_text(data1_handle dh, NMEM m, data1_node *n)
+{
+ for (; n; n = n->next)
+ {
+ if (n->which == DATA1N_data && n->next &&
+ n->next->which == DATA1N_data)
+ {
+ int sz = 0;
+ int off = 0;
+ char *ndata;
+ data1_node *np;
+ for (np = n; np && np->which == DATA1N_data; np=np->next)
+ sz += np->u.data.len;
+ ndata = nmem_malloc(m, sz);
+ for (np = n; np && np->which == DATA1N_data; np=np->next)
+ {
+ memcpy(ndata+off, np->u.data.data, np->u.data.len);
+ off += np->u.data.len;
+ }
+ n->u.data.data = ndata;
+ n->u.data.len = sz;
+ n->next = np;
+ if (!np && n->parent)
+ n->parent->last_child = n;
+
+ }
+ data1_concat_text(dh, m, n->child);
+ }
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff