projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WS. Use data1_concat_text
[idzebra-moved-to-github.git]
/
recctrl
/
xmlread.c
diff --git
a/recctrl/xmlread.c
b/recctrl/xmlread.c
index
90b17d3
..
7bbc2da
100644
(file)
--- a/
recctrl/xmlread.c
+++ b/
recctrl/xmlread.c
@@
-1,4
+1,4
@@
-/* $Id: xmlread.c,v 1.3 2002-08-28 12:47:10 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
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-36,7
+36,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <yaz/xmalloc.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
#include <yaz/log.h>
-#include <yaz/data1.h>
+#include <data1.h>
#include <expat.h>
#include <expat.h>
@@
-202,7
+202,10
@@
static int cb_external_entity (XML_Parser pparser,
}
if (!XML_ParseBuffer (parser, r, done))
{
}
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)));
}
}
XML_ErrorString(XML_GetErrorCode(parser)));
}
}
@@
-223,6
+226,9
@@
static int cb_encoding_convert (void *data, const char *s)
char *inbuf = (char *) s;
unsigned short code;
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)
{
ret = iconv (t, &inbuf, &inleft, &outbuf, &outleft);
if (ret == (size_t) (-1) && errno != E2BIG)
{
@@
-336,8
+342,9
@@
static int cb_encoding_handler (void *userData, const char *name,
if (errno == E2BIG)
{
info->map[i] = -1; /* no room for output */
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)
}
}
else if (outleft == 0)
@@
-381,7
+388,7
@@
data1_node *zebra_read_xml (data1_handle dh,
struct user_info uinfo;
int done = 0;
struct user_info uinfo;
int done = 0;
- uinfo.loglevel = LOG_LOG;
+ uinfo.loglevel = LOG_DEBUG;
uinfo.level = 1;
uinfo.dh = dh;
uinfo.nmem = m;
uinfo.level = 1;
uinfo.dh = dh;
uinfo.nmem = m;
@@
-423,7
+430,9
@@
data1_node *zebra_read_xml (data1_handle dh,
done = 1;
if (!XML_ParseBuffer (parser, r, done))
{
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)));
}
}
XML_ErrorString(XML_GetErrorCode(parser)));
}
}