data1 part of zebra

[idzebra-moved-to-github.git] / recctrl / xmlread.c

diff --git a/recctrl/xmlread.c b/recctrl/xmlread.c
index 90b17d3..e39e1b5 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.6 2002-10-22 12:51:09 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)));
        }
     }
@@ -381,7 +384,7 @@ data1_node *zebra_read_xml (data1_handle dh,
     struct user_info uinfo;
     int done = 0;
 
-    uinfo.loglevel = LOG_LOG;
+    uinfo.loglevel = LOG_DEBUG;
     uinfo.level = 1;
     uinfo.dh = dh;
     uinfo.nmem = m;
@@ -423,7 +426,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)));
        }
     }