neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't mistake file paths for URLs

This commit is contained in:
Zane U. Ji 2014-03-25 23:14:45 +08:00
parent cff6fb4256
commit 0df7f55493
2 changed files with 69 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/wraplibxml.cpp
View File

@ -29,10 +29,11 @@
#include <wx/filesys.h> #include <wx/filesys.h>
#include <wx/uri.h> #include <wx/uri.h>
// Convert wxString to const char *
#ifdef __WXMSW__ // Libxml supports utf8 file name on windows #ifdef __WXMSW__ // Libxml supports utf8 file name on windows
#define CONV(url) ( ( const char * ) ( url ).utf8_str() ) #define CONV(s) ( ( const char * ) ( s ).utf8_str() )
#else #else
#define CONV(url) ( ( const char * ) ( url ).mb_str ( wxConvLocal ) ) #define CONV(s) ( ( const char * ) ( s ).mb_str ( wxConvLocal ) )
#endif #endif
@ -49,8 +50,8 @@ public:
LIBXML_TEST_VERSION LIBXML_TEST_VERSION
xmlInitializeCatalog(); xmlInitializeCatalog();
xmlLoadCatalog ( catalogPath.mb_str() ); xmlLoadCatalog ( CONV ( catalogPath ) );
::catalog = xmlLoadACatalog ( catalogPath.mb_str() ); ::catalog = xmlLoadACatalog ( CONV ( catalogPath ) );
initGenericErrorDefaultFunc ( NULL ); initGenericErrorDefaultFunc ( NULL );
} }
@ -112,7 +113,7 @@ WrapLibxml::~WrapLibxml()
} }
bool WrapLibxml::validate ( const std::string& utf8DocBuf, bool WrapLibxml::validate ( const std::string& utf8DocBuf,
const wxString &docUrl ) const wxString &docFileName )
{ {
output = ""; output = "";
@ -130,7 +131,8 @@ bool WrapLibxml::validate ( const std::string& utf8DocBuf,
if ( !netAccess ) if ( !netAccess )
flags |= XML_PARSE_NONET; flags |= XML_PARSE_NONET;
docPtr = xmlCtxtReadMemory ( ctxt, utf8DocBuf.c_str(), utf8DocBuf.length(), docPtr = xmlCtxtReadMemory ( ctxt, utf8DocBuf.c_str(), utf8DocBuf.length(),
CONV ( docUrl ), "UTF-8", flags); CONV ( wxFileSystem::FileNameToURL ( docFileName ) ),
"UTF-8", flags);
bool returnValue = docPtr != NULL && ctxt->valid != 0; bool returnValue = docPtr != NULL && ctxt->valid != 0;
@ -143,7 +145,7 @@ bool WrapLibxml::validate ( const std::string& utf8DocBuf,
bool WrapLibxml::validateRelaxNG ( bool WrapLibxml::validateRelaxNG (
const wxString &schemaFileName, const wxString &schemaFileName,
const std::string &utf8DocBuf, const std::string &utf8DocBuf,
const wxString &docUrl ) const wxString &docFileName )
{ {
output = ""; output = "";
@ -155,7 +157,8 @@ bool WrapLibxml::validateRelaxNG (
xmlRelaxNGPtr schemaPtr = NULL; xmlRelaxNGPtr schemaPtr = NULL;
do { do {
rngParserCtxt = xmlRelaxNGNewParserCtxt ( CONV ( schemaFileName ) ); rngParserCtxt = xmlRelaxNGNewParserCtxt (
CONV ( wxFileSystem::FileNameToURL ( schemaFileName ) ) );
if ( rngParserCtxt == NULL ) if ( rngParserCtxt == NULL )
{ {
nonParserError = _("Cannot create an RNG parser context"); nonParserError = _("Cannot create an RNG parser context");
@ -181,8 +184,14 @@ bool WrapLibxml::validateRelaxNG (
int flags = XML_PARSE_DTDVALID; int flags = XML_PARSE_DTDVALID;
if ( !netAccess ) if ( !netAccess )
flags |= XML_PARSE_NONET; flags |= XML_PARSE_NONET;
docPtr = xmlCtxtReadMemory ( ctxt, utf8DocBuf.c_str(), docPtr = xmlCtxtReadMemory (
utf8DocBuf.length(), CONV ( docUrl ), "UTF-8", flags ); ctxt,
utf8DocBuf.c_str(),
utf8DocBuf.length(),
CONV ( wxFileSystem::FileNameToURL ( docFileName ) ),
"UTF-8",
flags
);
if ( docPtr == NULL ) if ( docPtr == NULL )
break; break;
@ -202,7 +211,7 @@ bool WrapLibxml::validateRelaxNG (
bool WrapLibxml::validateW3CSchema ( bool WrapLibxml::validateW3CSchema (
const wxString &schemaFileName, const wxString &schemaFileName,
const std::string &utf8DocBuf, const std::string &utf8DocBuf,
const wxString &docUrl ) const wxString &docFileName )
{ {
output = ""; output = "";
@ -215,7 +224,8 @@ bool WrapLibxml::validateW3CSchema (
xmlSchemaPtr schemaPtr = NULL; xmlSchemaPtr schemaPtr = NULL;
do { do {
rngParserCtxt = xmlSchemaNewParserCtxt ( CONV ( schemaFileName ) ); rngParserCtxt = xmlSchemaNewParserCtxt (
CONV ( wxFileSystem::FileNameToURL ( schemaFileName ) ) );
if ( rngParserCtxt == NULL ) if ( rngParserCtxt == NULL )
return false; return false;
@ -239,8 +249,14 @@ bool WrapLibxml::validateW3CSchema (
int flags = XML_PARSE_DTDLOAD; int flags = XML_PARSE_DTDLOAD;
if ( !netAccess ) if ( !netAccess )
flags |= XML_PARSE_NONET; flags |= XML_PARSE_NONET;
docPtr = xmlCtxtReadMemory ( ctxt, utf8DocBuf.c_str(), docPtr = xmlCtxtReadMemory (
utf8DocBuf.length(), CONV ( docUrl ), "UTF-8", flags ); ctxt,
utf8DocBuf.c_str(),
utf8DocBuf.length(),
CONV ( wxFileSystem::FileNameToURL ( docFileName ) ),
"UTF-8",
flags
);
if ( docPtr == NULL ) if ( docPtr == NULL )
break; break;
@ -260,26 +276,26 @@ bool WrapLibxml::validateW3CSchema (
bool WrapLibxml::parse ( bool WrapLibxml::parse (
const std::string& utf8DocBuf, const std::string& utf8DocBuf,
const wxString &docUrl, const wxString &docFileName,
bool indent, bool indent,
bool resolveEntities ) bool resolveEntities )
{ {
return parse ( utf8DocBuf.c_str(), utf8DocBuf.length(), docUrl, return parse ( utf8DocBuf.c_str(), utf8DocBuf.length(), docFileName,
indent, resolveEntities ); indent, resolveEntities );
} }
bool WrapLibxml::parse ( bool WrapLibxml::parse (
const wxString &docUrl, const wxString &docFileName,
bool indent, bool indent,
bool resolveEntities ) bool resolveEntities )
{ {
return parse ( NULL, 0, docUrl, indent, resolveEntities ); return parse ( NULL, 0, docFileName, indent, resolveEntities );
} }
bool WrapLibxml::parse ( bool WrapLibxml::parse (
const char *utf8DocBuf, const char *utf8DocBuf,
size_t utf8DocBufSize, size_t utf8DocBufSize,
const wxString &docUrl, const wxString &docFileName,
bool indent, bool indent,
bool resolveEntities ) bool resolveEntities )
{ {
@ -303,9 +319,10 @@ bool WrapLibxml::parse (
if ( utf8DocBuf != NULL) if ( utf8DocBuf != NULL)
docPtr = xmlCtxtReadMemory ( ctxt, utf8DocBuf, utf8DocBufSize, docPtr = xmlCtxtReadMemory ( ctxt, utf8DocBuf, utf8DocBufSize,
CONV ( docUrl ), "UTF-8", flags ); CONV ( wxFileSystem::FileNameToURL ( docFileName ) ),
"UTF-8", flags );
else else
docPtr = xmlCtxtReadFile ( ctxt, CONV ( docUrl ), NULL, flags ); docPtr = xmlCtxtReadFile ( ctxt, CONV ( docFileName ), NULL, flags );
if ( docPtr == NULL ) if ( docPtr == NULL )
{ {
xmlFreeParserCtxt ( ctxt ); xmlFreeParserCtxt ( ctxt );
@ -340,7 +357,7 @@ bool WrapLibxml::parse (
} }
bool WrapLibxml::xpath ( const wxString &xpath, const std::string &utf8DocBuf, bool WrapLibxml::xpath ( const wxString &xpath, const std::string &utf8DocBuf,
const wxString &docUrl ) const wxString &docFileName )
{ {
output = ""; output = "";
@ -360,7 +377,7 @@ bool WrapLibxml::xpath ( const wxString &xpath, const std::string &utf8DocBuf,
ctxt, ctxt,
utf8DocBuf.c_str(), utf8DocBuf.c_str(),
utf8DocBuf.length(), utf8DocBuf.length(),
CONV ( docUrl ), CONV ( wxFileSystem::FileNameToURL ( docFileName ) ),
"UTF-8", "UTF-8",
//(netAccess) ? XML_PARSE_DTDLOAD | XML_PARSE_NOENT : XML_PARSE_DTDLOAD | XML_PARSE_NONET | XML_PARSE_NOENT //(netAccess) ? XML_PARSE_DTDLOAD | XML_PARSE_NOENT : XML_PARSE_DTDLOAD | XML_PARSE_NONET | XML_PARSE_NOENT
XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NSCLEAN XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NSCLEAN
@ -429,26 +446,26 @@ bool WrapLibxml::xpath ( const wxString &xpath, const std::string &utf8DocBuf,
bool WrapLibxml::xslt ( bool WrapLibxml::xslt (
const wxString &styleFileName, const wxString &styleFileName,
const std::string &utf8DocBuf, const std::string &utf8DocBuf,
const wxString &docUrl const wxString &docFileName
) )
{ {
return xslt ( styleFileName, utf8DocBuf.c_str(), utf8DocBuf.length(), return xslt ( styleFileName, utf8DocBuf.c_str(), utf8DocBuf.length(),
docUrl ); docFileName );
} }
bool WrapLibxml::xslt ( bool WrapLibxml::xslt (
const wxString &styleFileName, const wxString &styleFileName,
const wxString &docUrl const wxString &docFileName
) )
{ {
return xslt ( styleFileName, NULL, 0, docUrl ); return xslt ( styleFileName, NULL, 0, docFileName );
} }
bool WrapLibxml::xslt ( bool WrapLibxml::xslt (
const wxString &styleFileName, const wxString &styleFileName,
const char *utf8DocBuf, const char *utf8DocBuf,
size_t utf8DocBufSize, size_t utf8DocBufSize,
const wxString &docUrl const wxString &docFileName
) )
{ {
output = ""; output = "";
@ -480,9 +497,10 @@ bool WrapLibxml::xslt (
flags |= XML_PARSE_NONET; flags |= XML_PARSE_NONET;
if ( utf8DocBuf != NULL ) if ( utf8DocBuf != NULL )
doc = xmlCtxtReadMemory ( ctxt, utf8DocBuf, utf8DocBufSize, doc = xmlCtxtReadMemory ( ctxt, utf8DocBuf, utf8DocBufSize,
CONV ( docUrl ), "UTF-8", flags ); CONV ( wxFileSystem::FileNameToURL ( docFileName ) ),
"UTF-8", flags );
else else
doc = xmlCtxtReadFile ( ctxt, CONV ( docUrl ), NULL, flags ); doc = xmlCtxtReadFile ( ctxt, CONV ( docFileName ), NULL, flags );
if ( !doc ) if ( !doc )
break; break;
@ -580,7 +598,8 @@ int WrapLibxml::saveEncoding (
flags |= XML_PARSE_NONET; flags |= XML_PARSE_NONET;
if ( utf8Buffer != NULL ) if ( utf8Buffer != NULL )
docPtr = xmlCtxtReadMemory ( ctxt, utf8Buffer, utf8BufferSize, docPtr = xmlCtxtReadMemory ( ctxt, utf8Buffer, utf8BufferSize,
CONV ( fileNameSource ), "UTF-8", flags ); CONV ( wxFileSystem::FileNameToURL ( fileNameSource ) ),
"UTF-8", flags );
else else
docPtr = xmlCtxtReadFile ( ctxt, CONV ( fileNameSource ), NULL, flags ); docPtr = xmlCtxtReadFile ( ctxt, CONV ( fileNameSource ), NULL, flags );
if ( !docPtr ) if ( !docPtr )

30
src/wraplibxml.h
View File

@ -43,18 +43,20 @@ class WrapLibxml
WrapLibxml ( bool netAccessParameter = false ); WrapLibxml ( bool netAccessParameter = false );
virtual ~WrapLibxml(); virtual ~WrapLibxml();
bool validate ( const std::string &utf8DocBuf, const wxString &docUrl ); bool validate (
const std::string &utf8DocBuf,
const wxString &docFileName );
bool validateRelaxNG ( bool validateRelaxNG (
const wxString &schemaFileName, const wxString &schemaFileName,
const std::string &utf8DocBuf, const std::string &utf8DocBuf,
const wxString &docUrl ); const wxString &docFileName );
bool validateW3CSchema ( bool validateW3CSchema (
const wxString &schemaFileName, const wxString &schemaFileName,
const std::string &utf8DocBuf, const std::string &utf8DocBuf,
const wxString &docUrl ); const wxString &docFileName );
bool parse ( bool parse (
const std::string &utf8DocBuf, const std::string &utf8DocBuf,
const wxString &docUrl, const wxString &docFileName,
bool indent = false, bool indent = false,
bool resolveEntities = false ); bool resolveEntities = false );
bool parse ( bool parse (
@ -68,16 +70,22 @@ class WrapLibxml
bool indent = false, bool indent = false,
bool resolveEntities = false ); bool resolveEntities = false );
bool bufferWellFormed ( const std::string& utf8Buffer ); bool bufferWellFormed ( const std::string& utf8Buffer );
bool xpath ( const wxString &xpath, const std::string &utf8DocBuf, bool xpath (
const wxString &docUrl ); const wxString &xpath,
bool xslt ( const wxString &styleFileName,
const std::string &utf8DocBuf, const std::string &utf8DocBuf,
const wxString &docUrl ); const wxString &docFileName );
bool xslt ( const wxString &styleFileName, const wxString &docUrl ); bool xslt (
bool xslt ( const wxString &styleFileName, const wxString &styleFileName,
const std::string &utf8DocBuf,
const wxString &docFileName );
bool xslt (
const wxString &styleFileName,
const wxString &docFileName );
bool xslt (
const wxString &styleFileName,
const char *utf8DocBuf, const char *utf8DocBuf,
size_t utf8DocBufSize, size_t utf8DocBufSize,
const wxString &docUrl ); const wxString &docFileName );
wxString getLastError(); wxString getLastError();
std::pair<int, int> getErrorPosition(); std::pair<int, int> getErrorPosition();
std::string getOutput(); std::string getOutput();