Fixed order of declarations

[yaz-moved-to-github.git] / src / nfaxml.c

diff --git a/src/nfaxml.c b/src/nfaxml.c
index a573eee..84a8b0b 100644 (file)
--- 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.8 2006-07-06 14:06:17 heikki Exp $ 
  */
 
 /**
@@ -10,11 +10,11 @@
  *
  */
 
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
 
 #include <string.h>
 
-#include <libxml/parser.h>
+/* #include <libxml/parser.h> */
 #include <libxml/tree.h>
 #include <libxml/xinclude.h>
 
@@ -23,30 +23,14 @@
 #include <yaz/yconfig.h>
 #include <yaz/nfa.h>
 #include <yaz/nfaxml.h>
-
-
-
-
-/** \brief Log XML errors in yaz_log 
- *
- */
-
-static void log_xml_error(int errlevel, char *msg) {
-    xmlErrorPtr e=xmlGetLastError();
-    if (!e)  /* no error happened */
-        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",
-            e->str1, e->str2, e->str3, e->int1, e->int2 );
-}
+#include <yaz/libxml2_error.h>
 
 /** \brief Parse the NFA from a XML document 
  */
-yaz_nfa *yaz_nfa_parse_xml_doc(xmlDocPtr doc){
+yaz_nfa *yaz_nfa_parse_xml_doc(xmlDocPtr doc)
+{
+    libxml2_error_to_yazlog(YLOG_FATAL, "yaz_nfa_parse_doc");
+
     if (!doc)
         return 0;
 
@@ -56,26 +40,35 @@ yaz_nfa *yaz_nfa_parse_xml_doc(xmlDocPtr doc){
 
 /** \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;
-    xmlDocPtr doc = xmlParseFile(filepath);
+
+    xmlDocPtr doc;
+    libxml2_error_to_yazlog(YLOG_FATAL, "yaz_nfa_parse_xml_file");
+
+    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);
 }
 
+/** \brief Parse the NFA from a memory buffer
+ */
+yaz_nfa *yaz_nfa_parse_xml_memory(const char *xmlbuff) {
+    xmlDocPtr doc;
+    libxml2_error_to_yazlog(YLOG_FATAL, "yaz_nfa_parse_xml_memory");
+    doc = xmlParseMemory(xmlbuff, strlen(xmlbuff));
+    return yaz_nfa_parse_xml_doc(doc);
+}
+
 
 
-#endif /* HAVE_XML2 */
+#endif /* YAZ_HAVE_XML2 */
 
 
 /*