Just a few things re-arranged, moved the new taf/xml systems to the inprogress

directory, and moved the old xml system in, so it will require heavy changes.

1 files changed, 166 insertions, 2 deletions

diff --git a/src/xmlwriter.cpp b/src/xmlwriter.cpp
index 23a5175..56880b6 100644
--- a/src/xmlwriter.cpp
+++ b/src/xmlwriter.cpp
@@ -1,9 +1,173 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include "xmlwriter.h"
 
-Bu::XmlWriter::XmlWriter()
+XmlWriter::XmlWriter( const char *sIndent, XmlNode *pRoot ) :
+        XmlDocument( pRoot )
 {
+        if( sIndent == NULL )
+        {
+                this->sIndent = "";
+        }
+        else
+        {
+                this->sIndent = sIndent;
+        }
 }
 
-Bu::XmlWriter::~XmlWriter()
+XmlWriter::~XmlWriter()
 {
 }
+
+void XmlWriter::write()
+{
+        write( getRoot(), sIndent.c_str() );
+}
+
+void XmlWriter::write( XmlNode *pRoot, const char *sIndent )
+{
+        writeNode( pRoot, 0, sIndent );
+}
+
+void XmlWriter::closeNode()
+{
+        XmlDocument::closeNode();
+
+        if( isCompleted() )
+        {
+                write( getRoot(), sIndent.c_str() );
+        }
+}
+
+void XmlWriter::writeIndent( int nIndent, const char *sIndent )
+{
+        if( sIndent == NULL ) return;
+        for( int j = 0; j < nIndent; j++ )
+        {
+                writeString( sIndent );
+        }
+}
+
+std::string XmlWriter::escape( std::string sIn )
+{
+        std::string sOut;
+
+        std::string::const_iterator i;
+        for( i = sIn.begin(); i != sIn.end(); i++ )
+        {
+                if( ((*i >= ' ' && *i <= '9') ||
+                        (*i >= 'a' && *i <= 'z') ||
+                        (*i >= 'A' && *i <= 'Z') ) &&
+                        (*i != '\"' && *i != '\'' && *i != '&')
+                  )
+                {
+                        sOut += *i;
+                }
+                else
+                {
+                        sOut += "&#";
+                        char buf[4];
+                        sprintf( buf, "%u", (unsigned char)*i );
+                        sOut += buf;
+                        sOut += ';';
+                }
+        }
+
+        return sOut;
+}
+
+void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent )
+{
+        for( int j = 0; j < pNode->getNumProperties(); j++ )
+        {
+                writeString(" ");
+                writeString( pNode->getPropertyName( j ) );
+                writeString("=\"");
+                writeString( escape( pNode->getProperty( j ) ).c_str() );
+                writeString("\"");
+        }
+}
+
+void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent )
+{
+        if( pNode->hasChildren() )
+        {
+                writeIndent( nIndent, sIndent );
+                writeString("<");
+                writeString( pNode->getName() );
+                writeNodeProps( pNode, nIndent, sIndent );
+                if( sIndent )
+                        writeString(">\n");
+                else
+                        writeString(">");
+
+                if( pNode->getContent( 0 ) )
+                {
+                        writeIndent( nIndent+1, sIndent );
+                        if( sIndent )
+                        {
+                                writeString( pNode->getContent( 0 ) );
+                                writeString("\n");
+                        }
+                        else
+                                writeString( pNode->getContent( 0 ) );
+                }
+
+                int nNumChildren = pNode->getNumChildren();
+                for( int j = 0; j < nNumChildren; j++ )
+                {
+                        writeNode( pNode->getChild( j ), nIndent+1, sIndent );
+                        if( pNode->getContent( j+1 ) )
+                        {
+                                writeIndent( nIndent+1, sIndent );
+                                if( sIndent )
+                                {
+                                        writeString( pNode->getContent( j+1 ) );
+                                        writeString("\n");
+                                }
+                                else
+                                        writeString( pNode->getContent( j+1 ) );
+                        }
+                }
+                
+                writeIndent( nIndent, sIndent );
+                if( sIndent )
+                {
+                        writeString("</");
+                        writeString( pNode->getName() );
+                        writeString(">\n");
+                }
+                else
+                {
+                        writeString("</");
+                        writeString( pNode->getName() );
+                        writeString(">");
+                }
+        }
+        else if( pNode->getContent() )
+        {
+                writeIndent( nIndent, sIndent );
+                writeString("<");
+                writeString( pNode->getName() );
+                writeNodeProps( pNode, nIndent, sIndent );
+                writeString(">");
+                writeString( pNode->getContent() );
+                writeString("</");
+                writeString( pNode->getName() );
+                writeString(">");
+                if( sIndent )
+                        writeString("\n");
+        }
+        else
+        {
+                writeIndent( nIndent, sIndent );
+                writeString("<");
+                writeString( pNode->getName() );
+                writeNodeProps( pNode, nIndent, sIndent );
+                if( sIndent )
+                        writeString("/>\n");
+                else
+                        writeString("/>");
+        }
+}
+