* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: d1_read.c,v 1.51 2002-08-28 07:54:11 adam Exp $
+ * $Id: d1_read.c,v 1.54 2002-10-08 23:00:09 adam Exp $
*/
#include <assert.h>
return data1_mk_node2 (dh, m, type, 0);
}
-data1_node *data1_mk_node2 (data1_handle dh, NMEM m, int type,
- data1_node *parent)
+static void data1_init_node (data1_handle dh, data1_node *r, int type)
{
- data1_node *r;
-
- 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
- {
- r->root = parent->root;
- r->parent = parent;
- if (!parent->child)
- parent->child = parent->last_child = r;
- else
- parent->last_child->next = r;
- parent->last_child = r;
- }
r->which = type;
switch(type)
{
default:
logf (LOG_WARN, "data_mk_node_type. bad type = %d\n", type);
}
+}
+
+data1_node *data1_append_node (data1_handle dh, NMEM m, int type,
+ data1_node *parent)
+{
+ 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
+ {
+ r->root = parent->root;
+ r->parent = parent;
+ if (!parent->child)
+ parent->child = parent->last_child = r;
+ else
+ parent->last_child->next = r;
+ parent->last_child = r;
+ }
+ data1_init_node(dh, r, type);
+ return r;
+}
+
+data1_node *data1_mk_node2 (data1_handle dh, NMEM m, int type,
+ data1_node *parent)
+{
+ return data1_append_node (dh, m, type, parent);
+}
+
+data1_node *data1_insert_node (data1_handle dh, NMEM m, int type,
+ data1_node *parent)
+{
+ 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
+ {
+ r->root = parent->root;
+ r->parent = parent;
+ if (!parent->child)
+ parent->last_child = r;
+ else
+ r->next = parent->child;
+ parent->child = r;
+ }
+ data1_init_node(dh, r, type);
return r;
}
}
data1_node *data1_mk_preprocess (data1_handle dh, NMEM nmem,
- const char *target, const char **attr,
- data1_node *at)
+ const char *target,
+ const char **attr, data1_node *at)
+{
+ return data1_mk_preprocess_n (dh, nmem, target, strlen(target),
+ attr, at);
+}
+
+data1_node *data1_mk_preprocess_n (data1_handle dh, NMEM nmem,
+ 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 (dh, res, nmem, target);
-
+ 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;
*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;
*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;
{
char *b;
if (len >= DATA1_LOCALDATA)
- b = nmem_malloc (m, len+1);
+ b = (char *) nmem_malloc (m, len+1);
else
b = res->lbuf;
memcpy (b, str, len);
static data1_node *data1_add_insert_taggeddata(data1_handle dh,
data1_node *at,
const char *tagname, NMEM m,
- int local_allowed)
+ int local_allowed,
+ int insert_mode)
{
data1_node *root = at->root;
data1_node *partag = get_parent_tag (dh, at);
}
if (local_allowed || e)
{
- tagn = data1_mk_node2 (dh, m, DATA1N_tag, at);
+ if (insert_mode)
+ tagn = data1_insert_node (dh, m, DATA1N_tag, at);
+ else
+ tagn = data1_append_node (dh, m, DATA1N_tag, at);
tagn->u.tag.tag = data1_insert_string (dh, tagn, m, tagname);
tagn->u.tag.element = e;
datn = data1_mk_node2 (dh, m, DATA1N_data, tagn);
data1_node *data1_mk_tag_data(data1_handle dh, data1_node *at,
const char *tagname, NMEM m)
{
- return data1_add_insert_taggeddata (dh, at, tagname, m, 1);
+ return data1_add_insert_taggeddata (dh, at, tagname, m, 1, 0);
}
data1_node *data1_mk_tag_data_wd(data1_handle dh, data1_node *at,
const char *tagname, NMEM m)
{
- return data1_add_insert_taggeddata (dh, at, tagname, m, 0);
+ return data1_add_insert_taggeddata (dh, at, tagname, m, 0, 1);
}
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, at, tagname, m, 0);
+ return data1_add_insert_taggeddata (dh, at, tagname, m, 0, 1);
}
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, at, tagname, m, 1);
+ return data1_add_insert_taggeddata (dh, at, tagname, m, 1, 0);
}
data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
static int ampr (int (*get_byte)(void *fh), void *fh, int *amp)
{
+#if 1
+ int c = (*get_byte)(fh);
+ *amp = 0;
+ return c;
+#else
int c = (*get_byte)(fh);
*amp = 0;
if (c == '&')
}
}
return c;
+#endif
}
data1_xattr *data1_read_xattr (data1_handle dh, NMEM m,
p->next = 0;
pp = &p->next;
p->value = 0;
+ p->what = DATA1I_xmltext;
wrbuf_rewind(wrbuf);
while (c && c != '=' && c != '>' && c != '/' && !d1_isspace(c))
c = ampr (get_byte, fh, &);
}
else if (amp == 0 && c == '!')
- /* tags/comments that we don't deal with yet */
{
- while (amp || (c && c != '>'))
- c = ampr (get_byte, fh, &);
- if (c)
- c = ampr (get_byte, fh, &);
- continue;
+ 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)
+ {
+ if (amp == 0 && c == '-')
+ no_dash++;
+ else if (amp == 0 && c == '>' && no_dash >= 2)
+ {
+ if (level > 0)
+ d1_stack[level] =
+ data1_mk_comment_n (
+ dh, m,
+ wrbuf_buf(wrbuf), wrbuf_len(wrbuf)-2,
+ d1_stack[level-1]);
+ c = ampr (get_byte, fh, &); /* skip > */
+ break;
+ }
+ else
+ no_dash = 0;
+ wrbuf_putc (wrbuf, c);
+ c = ampr (get_byte, fh, &);
+ }
+ continue;
+ }
+ else
+ { /* DIRECTIVE: <! .. > */
+
+ int blevel = 0;
+ while (amp || c)
+ {
+ if (amp == 0 && c == '>' && blevel == 0)
+ {
+ c = ampr (get_byte, fh, &);
+ break;
+ }
+ if (amp == 0 && c == '[')
+ blevel++;
+ if (amp == 0 && c == ']' && blevel > 0)
+ blevel--;
+ c = ampr (get_byte, fh, &);
+ }
+ continue;
+ }
}
while (amp || (c && c != '>' && c != '/' && !d1_isspace(c)))
{
continue;
}
res = data1_mk_node2 (dh, m, DATA1N_data, parent);
- res->u.data.what = DATA1I_text;
+ res->u.data.what = DATA1I_xmltext;
res->u.data.formatted_text = 0;
d1_stack[level] = res;
projects / yaz-moved-to-github.git / blobdiff