version 0.3.0

[fms.git] / src / freenet / boardlistxml.cpp

diff --git a/src/freenet/boardlistxml.cpp b/src/freenet/boardlistxml.cpp
index 3de52f0..b4c3985 100644 (file)
--- a/src/freenet/boardlistxml.cpp
+++ b/src/freenet/boardlistxml.cpp
@@ -49,27 +49,35 @@ const std::string BoardListXML::GetName(const long index)
 \r
 std::string BoardListXML::GetXML()\r
 {\r
-       TiXmlDocument td;\r
-       TiXmlDeclaration *tdec=new TiXmlDeclaration("1.0","UTF-8","");\r
-       TiXmlElement *tid;\r
-       TiXmlPrinter tp;\r
-\r
-       td.LinkEndChild(tdec);\r
-       tid=new TiXmlElement("BoardList");\r
-       td.LinkEndChild(tid);\r
+       Poco::AutoPtr<Poco::XML::Document> doc=new Poco::XML::Document;\r
+       //TiXmlDocument td;\r
+       //TiXmlDeclaration *tdec=new TiXmlDeclaration("1.0","UTF-8","");\r
+       Poco::XML::Element *root=doc->createElement("BoardList");\r
+       //TiXmlElement *tid;\r
+       //TiXmlPrinter tp;\r
+\r
+       doc->appendChild(root);\r
+       //td.LinkEndChild(tdec);\r
+       //tid=new TiXmlElement("BoardList");\r
+       //td.LinkEndChild(tid);\r
 \r
        for(std::vector<board>::iterator i=m_boards.begin(); i!=m_boards.end(); i++)\r
        {\r
                std::string boardname=(*i).m_name;\r
                StringFunctions::LowerCase(boardname,boardname);\r
-               TiXmlElement *tr=new TiXmlElement("Board");\r
-               tid->LinkEndChild(tr);\r
-               tr->LinkEndChild(XMLCreateCDATAElement("Name",boardname));\r
-               tr->LinkEndChild(XMLCreateCDATAElement("Description",(*i).m_description));\r
+               Poco::XML::Element *tr=doc->createElement("Board");\r
+               //TiXmlElement *tr=new TiXmlElement("Board");\r
+               root->appendChild(tr);\r
+               //tid->LinkEndChild(tr);\r
+               tr->appendChild(XMLCreateCDATAElement(doc,"Name",boardname));\r
+               //tr->LinkEndChild(XMLCreateCDATAElement("Name",boardname));\r
+               tr->appendChild(XMLCreateCDATAElement(doc,"Description",(*i).m_description));\r
+               //tr->LinkEndChild(XMLCreateCDATAElement("Description",(*i).m_description));\r
        }\r
 \r
-       td.Accept(&tp);\r
-       return std::string(tp.CStr());\r
+       //td.Accept(&tp);\r
+       //return std::string(tp.CStr());\r
+       return GenerateXML(doc);\r
 }\r
 \r
 void BoardListXML::Initialize()\r
@@ -79,6 +87,57 @@ void BoardListXML::Initialize()
 \r
 const bool BoardListXML::ParseXML(const std::string &xml)\r
 {\r
+       bool parsed=false;\r
+       Poco::XML::DOMParser dp;\r
+\r
+       Initialize();\r
+\r
+       try\r
+       {\r
+               Poco::AutoPtr<Poco::XML::Document> doc=dp.parseString(FixCDATA(xml));\r
+               Poco::XML::Element *root=XMLGetFirstChild(doc,"BoardList");\r
+               Poco::XML::Element *boardel=NULL;\r
+\r
+               boardel=XMLGetFirstChild(root,"Board");\r
+               while(boardel)\r
+               {\r
+                       std::string name="";\r
+                       std::string description="";\r
+\r
+                       Poco::XML::Element *txt=XMLGetFirstChild(boardel,"Name");\r
+                       if(txt && txt->firstChild())\r
+                       {\r
+                               name=SanitizeSingleString(txt->firstChild()->getNodeValue());\r
+                               StringFunctions::LowerCase(name,name);\r
+                               if(name.size()>40)\r
+                               {\r
+                                       name.erase(40);\r
+                               }\r
+                       }\r
+                       txt=XMLGetFirstChild(boardel,"Description");\r
+                       if(txt && txt->firstChild())\r
+                       {\r
+                               description=SanitizeSingleString(txt->firstChild()->getNodeValue());\r
+                       }\r
+\r
+                       if(name!="" && description!="")\r
+                       {\r
+                               m_boards.push_back(board(name,description));\r
+                       }\r
+\r
+                       boardel=XMLGetNextSibling(boardel,"Board");\r
+               }\r
+\r
+               parsed=true;\r
+\r
+       }\r
+       catch(...)\r
+       {\r
+       }\r
+\r
+       return parsed;\r
+\r
+       /*\r
        std::string name;\r
        std::string description;\r
        TiXmlDocument td;\r
@@ -129,4 +188,5 @@ const bool BoardListXML::ParseXML(const std::string &xml)
        {\r
                return false;\r
        }\r
+       */\r
 }\r