X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fnfaxml.c;h=60764a115cd389f72adc36bc2f47468db624c9b7;hb=11d1675ce7431f8b58a9b4d458c1b7a929a51959;hp=a573eee4041c3d79cb536f28d536c28574361201;hpb=fb61309506b52ca0dad9aea4135ceeda63707b0d;p=yaz-moved-to-github.git

diff --git a/src/nfaxml.c b/src/nfaxml.c
index a573eee..60764a1 100644
--- a/src/nfaxml.c
+++ b/src/nfaxml.c
@@ -1,7 +1,7 @@
 /*  Copyright (C) 2006, Index Data ApS
  *  See the file LICENSE for details.
  * 
- *  $Id: nfaxml.c,v 1.1 2006-07-04 12:59:56 heikki Exp $ 
+ *  $Id: nfaxml.c,v 1.3 2006-07-06 07:45:07 adam Exp $ 
  */
 
 /**
@@ -23,51 +23,51 @@
 #include <yaz/yconfig.h>
 #include <yaz/nfa.h>
 #include <yaz/nfaxml.h>
+#include <yaz/libxml2_error.h>
 
+/** \brief Parse the NFA from a XML document 
+ */
+yaz_nfa *yaz_nfa_parse_xml_doc(void *xmlDocPtr)
+{
+    xmlDocPtr doc = (xmlDocPtr) *xmlDocPtr;
+    if (!doc)
+        return 0;
 
+    return 0;
+}
 
-
-/** \brief Log XML errors in yaz_log 
+/** \brief Log XML errors in yaz_log
  *
+ * Disabled because xmlErrorPtr does not exist for older Libxml2's
  */
-
+#if 0
 static void log_xml_error(int errlevel, char *msg) {
     xmlErrorPtr e=xmlGetLastError();
     if (!e)  /* no error happened */
-        return;  
+        return;
     if (!errlevel)
         errlevel=YLOG_FATAL;
     yaz_log(errlevel,"%s %d/%d: %s:%d: '%s' ",
             msg, e->domain, e->code, e->file, e->line, e->message);
-    if (e->str1 || e->str2 || e->str3 ) 
-    yaz_log(errlevel,"extra info: '%s' '%s' '%s' %d %d",
+    if (e->str1 || e->str2 || e->str3 )
+        yaz_log(errlevel,"extra info: '%s' '%s' '%s' %d %d",
             e->str1, e->str2, e->str3, e->int1, e->int2 );
 }
-
-/** \brief Parse the NFA from a XML document 
- */
-yaz_nfa *yaz_nfa_parse_xml_doc(xmlDocPtr doc){
-    if (!doc)
-        return 0;
-
-    return 0;
-}
-
+#endif
 
 /** \brief Parse the NFA from a file 
  */
-yaz_nfa *yaz_nfa_parse_xml_file(char *filepath) {
+yaz_nfa *yaz_nfa_parse_xml_file(const char *filepath) {
     int nSubst;
+
+    libxml2_error_to_yazlog(YLOG_FATAL, "yaz_nfa_parse_xml_file");
+
     xmlDocPtr doc = xmlParseFile(filepath);
     if (!doc) {
-        log_xml_error(YLOG_FATAL,
-                "Error in parsing charmap file");
         return 0;
     }
     nSubst=xmlXIncludeProcess(doc);
     if (nSubst==-1) {
-        log_xml_error(YLOG_FATAL,
-                "Error handling XIncludes in charmap file");
         return 0;
     }
     return yaz_nfa_parse_xml_doc(doc);