X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fxmlread.c;h=7bbc2dae293e952ea221f3b59e08576efdd89170;hb=c4318fe5480927a441042829d2953fc1484fb46b;hp=310e742ebaad635724e4120426d1549fe25e1906;hpb=ff8552d3012ab841cc90d5f80e5ad1373e194fde;p=idzebra-moved-to-github.git

diff --git a/recctrl/xmlread.c b/recctrl/xmlread.c
index 310e742..7bbc2da 100644
--- a/recctrl/xmlread.c
+++ b/recctrl/xmlread.c
@@ -1,4 +1,4 @@
-/* $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
 
@@ -36,7 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
-#include <yaz/data1.h>
+#include <data1.h>
 
 #include <expat.h>
 
@@ -202,7 +202,10 @@ static int cb_external_entity (XML_Parser pparser,
         }
         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)));
 	}
     }
@@ -223,6 +226,9 @@ static int cb_encoding_convert (void *data, const char *s)
     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)
     {
@@ -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 */
-                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)
@@ -423,7 +430,9 @@ data1_node *zebra_read_xml (data1_handle dh,
             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)));
 	}
     }