* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: d1_read.c,v 1.50 2002-08-26 10:43:52 adam Exp $
+ * $Id: d1_read.c,v 1.52 2002-09-24 07:58:59 adam Exp $
*/
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
-#include <errno.h>
-
-#if HAVE_ICONV_H
-#include <iconv.h>
-#endif
-
#include <yaz/xmalloc.h>
+#include <yaz/yaz-util.h>
#include <yaz/log.h>
#include <yaz/data1.h>
}
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)
{
{
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);
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)))
{
}
-#if HAVE_ICONV_H
-
-static int conv_item (NMEM m, iconv_t t,
+static int conv_item (NMEM m, yaz_iconv_t t,
WRBUF wrbuf, char *inbuf, size_t inlen)
{
wrbuf_rewind (wrbuf);
{
char *outbuf = wrbuf->buf + wrbuf->pos;
size_t outlen = wrbuf->size - wrbuf->pos;
- if (iconv (t, &inbuf, &inlen, &outbuf, &outlen) ==
- (size_t)(-1) && errno != E2BIG)
+ 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;
}
static void data1_iconv_s (data1_handle dh, NMEM m, data1_node *n,
- iconv_t t, WRBUF wrbuf, const char *tocode)
+ yaz_iconv_t t, WRBUF wrbuf, const char *tocode)
{
for (; n; n = n->next)
{
data1_iconv_s (dh, m, n->child, t, wrbuf, tocode);
}
}
-#endif
const char *data1_get_encoding (data1_handle dh, data1_node *n)
{
const char *tocode,
const char *fromcode)
{
-#if HAVE_ICONV_H
if (strcmp (tocode, fromcode))
{
WRBUF wrbuf = wrbuf_alloc();
- iconv_t t = iconv_open (tocode, fromcode);
- if (t == (iconv_t) (-1))
+ yaz_iconv_t t = yaz_iconv_open (tocode, fromcode);
+ if (!t)
return -1;
data1_iconv_s (dh, m, n, t, wrbuf, tocode);
- iconv_close (t);
+ yaz_iconv_close (t);
wrbuf_free (wrbuf, 1);
}
return 0;
-#else
- return -2;
-#endif
}