-/* $Id: xmlread.c,v 1.4 2002-08-29 08:41:07 adam Exp $
+/* $Id: xmlread.c,v 1.7 2003-05-05 09:58:42 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <yaz/xmalloc.h>
#include <yaz/log.h>
-#include <yaz/data1.h>
+#include <data1.h>
#include <expat.h>
}
if (!XML_ParseBuffer (parser, r, done))
{
- yaz_log (LOG_WARN, "XML_ParseBuffer failed %s",
+ 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)
done = 1;
if (!XML_ParseBuffer (parser, r, done))
{
- yaz_log (LOG_WARN, "XML_ParseBuffer (1) failed %s",
+ yaz_log (LOG_WARN, "%d:%d:XML error: %s",
+ XML_GetCurrentLineNumber(parser),
+ XML_GetCurrentColumnNumber(parser),
XML_ErrorString(XML_GetErrorCode(parser)));
}
}