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

Corrected catalog-based DTD validation (hence 1.1.0.4 rel. 2).

This commit is contained in:
Gerald Schmidt 2007-12-18 01:28:12 +00:00
parent 10a670f713
commit 100432dc9e
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xmlcopyeditor.cpp
View File

@ -3590,7 +3590,6 @@ void MyFrame::OnUpdateClosePane ( wxUpdateUIEvent& event )
event.Enable ( i1.IsShown() || i2.IsShown() || i3.IsShown() ); event.Enable ( i1.IsShown() || i2.IsShown() || i3.IsShown() );
} }
/*
void MyFrame::OnValidateDTD ( wxCommandEvent& event ) void MyFrame::OnValidateDTD ( wxCommandEvent& event )
{ {
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
@ -3651,7 +3650,6 @@ void MyFrame::OnValidateDTD ( wxCommandEvent& event )
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
documentOk ( _ ( "valid" ) ); documentOk ( _ ( "valid" ) );
} }
*/
void MyFrame::OnValidateRelaxNG ( wxCommandEvent& event ) void MyFrame::OnValidateRelaxNG ( wxCommandEvent& event )
{ {
@ -3772,6 +3770,17 @@ void MyFrame::OnValidateSchema ( wxCommandEvent& event )
if ( ( doc = getActiveDocument() ) == NULL ) if ( ( doc = getActiveDocument() ) == NULL )
return; return;
// branch: if no XML Schema found, use LibXML DTD parser instead
// so the catalog is read - switch when Xerces-C implements
// XMLCatalogResolver
std::string rawBuffer, schemaLocation;
getRawText ( doc, rawBuffer );
auto_ptr<XmlSchemaLocator> xsl (new XmlSchemaLocator() );
xsl->parse ( rawBuffer.c_str() );
if ( ( xsl->getSchemaLocation() ) . empty() )
OnValidateDTD ( event );
// end of branch
wxString fileName; wxString fileName;
std::string tempFileNameLocal; std::string tempFileNameLocal;
fileName = doc->getFullFileName(); fileName = doc->getFullFileName();
@ -5417,6 +5426,7 @@ void MyFrame::statusProgress ( const wxString& s )
void MyFrame::messagePane ( const wxString& s, int iconType, bool forcePane ) void MyFrame::messagePane ( const wxString& s, int iconType, bool forcePane )
{ {
statusProgress ( wxEmptyString );
wxString paneTitle; wxString paneTitle;
switch ( iconType ) switch ( iconType )
{ {
@ -5884,8 +5894,8 @@ void MyFrame::loadBitmaps()
internetBitmap = wxBITMAP ( stock_internet ); internetBitmap = wxBITMAP ( stock_internet );
hyperlinkBitmap = wxBITMAP ( stock_hyperlink ); hyperlinkBitmap = wxBITMAP ( stock_hyperlink );
filtersBitmap = wxBITMAP ( stock_filters ); filtersBitmap = wxBITMAP ( stock_filters );
checkWellformedBitmap = wxNullBitmap; checkWellformedBitmap = wxBITMAP ( stock_calc-accept );
checkValidBitmap = wxNullBitmap; checkValidBitmap = wxBITMAP ( stock_calc-accept-green );
// menu icons // menu icons
new16Bitmap = wxBITMAP ( stock_new_16 ); new16Bitmap = wxBITMAP ( stock_new_16 );

2
src/xmlcopyeditorcopy.h
View File

@ -41,5 +41,5 @@
"License along with this program; if not, write to the Free\n"\ "License along with this program; if not, write to the Free\n"\
"Software Foundation, Inc., 59 Temple Place, Suite 330,\n"\ "Software Foundation, Inc., 59 Temple Place, Suite 330,\n"\
"Boston, MA 02111-1307 USA.") "Boston, MA 02111-1307 USA.")
#define ABOUT_VERSION _T("1.1.0.3") #define ABOUT_VERSION _T("1.1.0.4")
#define XMLCE_VAR _T("XMLCE_VAR") #define XMLCE_VAR _T("XMLCE_VAR")