Make archive top level dirs match that of the archive name.

[wxWidgets.git] / src / xml / xml.cpp

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index b812bb331d86c07f70dd08170784faee8b7272bf..d53297f0aec7badc27109bbf425ff9211e9aa598 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xml.cpp
+// Name:        src/xml/xml.cpp

 // Purpose:     wxXmlDocument - XML parser & data holder class
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     wxXmlDocument - XML parser & data holder class
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -15,21 +15,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XML
+

 #include "wx/xml/xml.h"
 
 #include "wx/xml/xml.h"
 

-#if wxUSE_XML
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif

 
 #include "wx/wfstream.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"
 
 #include "wx/wfstream.h"
 #include "wx/datstrm.h"
 #include "wx/zstream.h"

-#include "wx/log.h"
-#include "wx/intl.h"

 #include "wx/strconv.h"
 
 #include "expat.h" // from Expat
 
 // DLL options compatibility check:
 #include "wx/strconv.h"
 
 #include "expat.h" // from Expat
 
 // DLL options compatibility check:

-#include "wx/app.h"

 WX_CHECK_BUILD_OPTIONS("wxXML")
 
 
 WX_CHECK_BUILD_OPTIONS("wxXML")
 
 


@@ -345,12 +348,16 @@ void wxXmlDocument::DoCopy(const wxXmlDocument& doc)
 bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding)
 {
     wxFileInputStream stream(filename);
 bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding)
 {
     wxFileInputStream stream(filename);

+    if (!stream.Ok())
+        return false;

     return Load(stream, encoding);
 }
 
 bool wxXmlDocument::Save(const wxString& filename) const
 {
     wxFileOutputStream stream(filename);
     return Load(stream, encoding);
 }
 
 bool wxXmlDocument::Save(const wxString& filename) const
 {
     wxFileOutputStream stream(filename);

+    if (!stream.Ok())
+        return false;

     return Save(stream);
 }
 
     return Save(stream);
 }
 


@@ -382,7 +389,7 @@ static wxString CharToString(wxMBConv *conv,
         const wxWCharBuffer wbuf(
             wxConvUTF8.cMB2WC(s, len == wxSTRING_MAXLEN ? wxNO_LEN : len, NULL));
 
         const wxWCharBuffer wbuf(
             wxConvUTF8.cMB2WC(s, len == wxSTRING_MAXLEN ? wxNO_LEN : len, NULL));
 

-        return wxString(wbuf, conv);
+        return wxString(wbuf, *conv);

     }
     else // already in UTF-8, no conversion needed
     {
     }
     else // already in UTF-8, no conversion needed
     {


@@ -399,6 +406,7 @@ struct wxXmlParsingContext
     wxXmlNode *lastAsText;
     wxString   encoding;
     wxString   version;
     wxXmlNode *lastAsText;
     wxString   encoding;
     wxString   version;

+       bool    bLastCdata;

 };
 
 extern "C" {
 };
 
 extern "C" {


@@ -442,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
     {


@@ -466,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" {
 static void CommentHnd(void *userData, const char *data)
 {
 extern "C" {
 static void CommentHnd(void *userData, const char *data)
 {


@@ -558,10 +595,12 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
     if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") )
         ctx.conv = new wxCSConv(encoding);
 #endif
     if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") )
         ctx.conv = new wxCSConv(encoding);
 #endif

+       ctx.bLastCdata = false;

 
     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
     XML_SetCharacterDataHandler(parser, TextHnd);
 
     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
     XML_SetCharacterDataHandler(parser, TextHnd);

+       XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd );

     XML_SetCommentHandler(parser, CommentHnd);
     XML_SetDefaultHandler(parser, DefaultHnd);
     XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);
     XML_SetCommentHandler(parser, CommentHnd);
     XML_SetDefaultHandler(parser, DefaultHnd);
     XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);


@@ -704,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:
             OutputStringEnt(stream, node->GetContent(), convMem, convFile);
             break;
         case wxXML_TEXT_NODE:
             OutputStringEnt(stream, node->GetContent(), convMem, convFile);
             break;