-/* $Id: xmlread.c,v 1.6 2002-10-22 12:51:09 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: xmlread.c,v 1.11 2003-09-08 09:51:02 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
}
if (!XML_ParseBuffer (parser, r, done))
{
- yaz_log (LOG_WARN, "%s:%d:%d:XML error: %s",
- systemId,
- XML_GetCurrentLineNumber(parser),
- XML_GetCurrentColumnNumber(parser),
+ done = 1;
+ yaz_log (LOG_WARN, "%s:%d:%d:XML error: %s",
+ systemId,
+ XML_GetCurrentLineNumber(parser),
+ XML_GetCurrentColumnNumber(parser),
XML_ErrorString(XML_GetErrorCode(parser)));
}
}
char *inbuf = (char *) s;
unsigned short code;
+#if 1
+ yaz_log(LOG_LOG, "------------------------- cb_encoding_convert --- ");
+#endif
ret = iconv (t, &inbuf, &inleft, &outbuf, &outleft);
if (ret == (size_t) (-1) && errno != E2BIG)
{
if (errno == E2BIG)
{
info->map[i] = -1; /* no room for output */
- yaz_log (LOG_WARN, "Encoding %d: no room for output",
- i);
+ if (i != 0)
+ yaz_log (LOG_WARN, "Encoding %d: no room for output",
+ i);
}
}
else if (outleft == 0)
/* HAVE_ICONV_H */
#endif
+static void cb_ns_start(void *userData, const char *prefix, const char *uri)
+{
+ struct user_info *ui = (struct user_info*) userData;
+ if (prefix && uri)
+ yaz_log(ui->loglevel, "cb_ns_start %s %s", prefix, uri);
+}
+static void cb_ns_end(void *userData, const char *prefix)
+{
+ struct user_info *ui = (struct user_info*) userData;
+ if (prefix)
+ yaz_log(ui->loglevel, "cb_ns_end %s", prefix);
+}
data1_node *zebra_read_xml (data1_handle dh,
int (*rf)(void *, char *, size_t), void *fh,
NMEM m)
XML_SetDoctypeDeclHandler (parser, cb_doctype_start, cb_doctype_end);
XML_SetEntityDeclHandler (parser, cb_entity_decl);
XML_SetExternalEntityRefHandler (parser, cb_external_entity);
+ XML_SetNamespaceDeclHandler(parser, cb_ns_start, cb_ns_end);
#if HAVE_ICONV_H
XML_SetUnknownEncodingHandler (parser, cb_encoding_handler, &uinfo);
#endif
done = 1;
if (!XML_ParseBuffer (parser, r, done))
{
- yaz_log (LOG_WARN, "%d:%d:XML error: %s",
- XML_GetCurrentLineNumber(parser),
- XML_GetCurrentColumnNumber(parser),
+ done = 1;
+ yaz_log (LOG_WARN, "%d:%d:XML error: %s",
+ XML_GetCurrentLineNumber(parser),
+ XML_GetCurrentColumnNumber(parser),
XML_ErrorString(XML_GetErrorCode(parser)));
}
}
}
struct xml_info {
- int dummy;
+ XML_Expat_Version expat_version;
};
static void *grs_init_xml(void)
{
struct xml_info *p = (struct xml_info *) xmalloc (sizeof(*p));
+
+ p->expat_version = XML_ExpatVersionInfo();
+
return p;
}
static void grs_destroy_xml(void *clientData)
{
- struct sgml_getc_info *p = (struct sgml_getc_info *) clientData;
+ struct xml_info *p = (struct xml_info *) clientData;
xfree (p);
}