Updated for 1.2.0.3

src/xercescatalogresolver.cpp

@@ -0,0 +1,91 @@
+#include "xercescatalogresolver.h"
+#include <xercesc/sax2/SAX2XMLReader.hpp>
+#include <xercesc/framework/LocalFileInputSource.hpp>
+
+#ifdef __WXMSW__
+#include "wx/wx.h"
+#include "replace.h"
+#endif
+
+InputSource *XercesCatalogResolver::resolveEntity (
+			const XMLCh* const publicID,
+			const XMLCh* const systemId )
+{
+/* the following _should_ work but doesn't always, so drop it for now
+#ifndef __WXMSW__
+	resolved = cr->lookupPublicId ( narrowPublicId );
+#else
+     return NULL;
+	std::string stdPublicId = narrowPublicId;
+
+    // on Windows, call libxml's own xmlcatalog binary
+    // because calling libxml from xerces causes a protection fault
+
+	std::string narrowCommand = "";
+    narrowCommand += myCatalogUtilityPath;
+	narrowCommand += " \"";
+	narrowCommand += myCatalogPath;
+	narrowCommand += "\" \"";
+	narrowCommand += narrowPublicId;
+	narrowCommand += "\"";
+	
+	wxString wideCommand = wxString (
+             narrowCommand.c_str(),
+             wxConvUTF8,
+             narrowCommand.size() );
+             
+	wxArrayString stringArray;
+    long ret = wxExecute (
+         wideCommand,
+         stringArray,
+         wxEXEC_SYNC | wxEXEC_NODISABLE );
+	if ( ret == -1 || stringArray.empty() )
+	{
+        return NULL;
+	}
+	wxString returnValue = stringArray[0];
+
+    std::string narrowReturnValue = (const char *)returnValue.mb_str ( wxConvLocal );
+    
+    Replace::run ( narrowReturnValue, "%20", " ", false );
+    
+    char *s, *it;
+    s = (char *) narrowReturnValue.c_str();
+    
+    for (char *scan = s; *scan; scan++ )
+        if (*scan == '/')
+           *scan = '\\';
+    
+    if ( strstr ( s, "No entry" ) )
+    {
+       return NULL;
+    }
+	   
+    it = strstr ( s, "\\\\\\" );
+    if ( it )
+       resolved = it + 3;
+    else
+        resolved = (const char *)s;//narrowReturnValue;
+#endif	
+*/
+
+#ifdef __WXMSW__
+       return NULL;
+#else
+	char *narrowPublicId = XMLString::transcode ( publicID );
+	std::string resolved;
+	resolved = cr->lookupPublicId ( narrowPublicId );
+
+	XMLString::release ( &narrowPublicId );
+	
+	if ( resolved.empty() )
+		return NULL;
+
+	XMLCh *wideResolved = XMLString::transcode ( resolved.c_str() );
+	
+    InputSource *source = (InputSource *)new LocalFileInputSource ( wideResolved );
+	XMLString::release ( &wideResolved );
+
+	return source;
+#endif
+}

src/xercescatalogresolver.h

@@ -0,0 +1,46 @@
+#ifndef XERCES_CATALOG_RESOLVER_H
+#define XERCES_CATALOG_RESOLVER_H
+
+#include <memory>
+#include <string>
+#include <xercesc/sax/EntityResolver.hpp>
+#include <xercesc/sax/InputSource.hpp>
+
+#ifndef __WXMSW__
+#include "catalogresolver.h"
+#endif
+
+using namespace xercesc;
+
+class XercesCatalogResolver : public EntityResolver
+{
+	public:
+		XercesCatalogResolver( std::string catalogPath = "",
+                               std::string catalogUtilityPath = "" )
+		{
+#ifndef __WXMSW__
+			cr = new CatalogResolver ( catalogPath );
+#else
+			myCatalogPath = catalogPath;
+			myCatalogUtilityPath = catalogUtilityPath;
+#endif
+		}
+		~XercesCatalogResolver()
+		{
+#ifndef __WXMSW__
+			delete cr;
+#endif
+		}
+		InputSource *resolveEntity (
+			const XMLCh * const publicID,
+			const XMLCh* const systemId );
+	private:
+#ifndef __WXMSW__
+		CatalogResolver *cr;
+#else
+		std::string myCatalogPath;
+		std::string myCatalogUtilityPath;
+#endif
+};
+
+#endif