Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Haakan Wiman's cdata XML patch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-01 11:14:36 +00:00
parent f5791b9983
commit a01cbf0a7c
1 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/xml/xml.cpp
View File

@@ -406,6 +406,7 @@ struct wxXmlParsingContext
wxXmlNode *lastAsText; wxXmlNode *lastAsText;
wxString encoding; wxString encoding;
wxString version; wxString version;
bool bLastCdata;
}; };
extern "C" { extern "C" {
@@ -449,8 +450,16 @@ static void TextHnd(void *userData, const char *s, int len)
if (ctx->lastAsText) if (ctx->lastAsText)
{ {
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + if ( ctx->bLastCdata )
{
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
CharToString(NULL, buf));
}
else
{
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
CharToString(ctx->conv, buf)); CharToString(ctx->conv, buf));
}
} }
else else
{ {
@@ -473,6 +482,27 @@ static void TextHnd(void *userData, const char *s, int len)
} }
} }
extern "C" {
static void StartCdataHnd(void *userData)
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->bLastCdata = true;
ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
ctx->node->AddChild(ctx->lastAsText);
}
}
extern "C" {
static void EndCdataHnd(void *userData)
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->bLastCdata = false;
}
}
extern "C" { extern "C" {
static void CommentHnd(void *userData, const char *data) static void CommentHnd(void *userData, const char *data)
{ {
@@ -565,10 +595,12 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") ) if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") )
ctx.conv = new wxCSConv(encoding); ctx.conv = new wxCSConv(encoding);
#endif #endif
ctx.bLastCdata = false;
XML_SetUserData(parser, (void*)&ctx); XML_SetUserData(parser, (void*)&ctx);
XML_SetElementHandler(parser, StartElementHnd, EndElementHnd); XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
XML_SetCharacterDataHandler(parser, TextHnd); XML_SetCharacterDataHandler(parser, TextHnd);
XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );
XML_SetCommentHandler(parser, CommentHnd); XML_SetCommentHandler(parser, CommentHnd);
XML_SetDefaultHandler(parser, DefaultHnd); XML_SetDefaultHandler(parser, DefaultHnd);
XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL); XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);
@@ -711,6 +743,12 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
switch (node->GetType()) switch (node->GetType())
{ {
case wxXML_CDATA_SECTION_NODE:
OutputString( stream, wxT("<![CDATA["));
OutputString( stream, node->GetContent() );
OutputString( stream, wxT("]]>") );
break;
case wxXML_TEXT_NODE: case wxXML_TEXT_NODE:
OutputStringEnt(stream, node->GetContent(), convMem, convFile); OutputStringEnt(stream, node->GetContent(), convMem, convFile);
break; break;