version 0.3.2

[fms.git] / src / http / identityexportxml.cpp

diff --git a/src/http/identityexportxml.cpp b/src/http/identityexportxml.cpp
index aff7623..521c4ca 100644 (file)
--- a/src/http/identityexportxml.cpp
+++ b/src/http/identityexportxml.cpp
@@ -101,24 +101,15 @@ const bool IdentityExportXML::GetSingleUse(const long index)
 std::string IdentityExportXML::GetXML()\r
 {\r
        Poco::AutoPtr<Poco::XML::Document> doc=new Poco::XML::Document;\r
-       Poco::XML::Element *root=doc->createElement("IdentityExport");\r
-       Poco::XML::Element *el=NULL;\r
-       //TiXmlDocument td;\r
-       //TiXmlDeclaration *tdec=new TiXmlDeclaration("1.0","UTF-8","");\r
-       //TiXmlElement *tid;\r
-       //TiXmlPrinter tp;\r
+       Poco::AutoPtr<Poco::XML::Element> root=doc->createElement("IdentityExport");\r
+       Poco::AutoPtr<Poco::XML::Element> el=NULL;\r
 \r
        doc->appendChild(root);\r
-       //td.LinkEndChild(tdec);\r
-       //tid=new TiXmlElement("IdentityExport");\r
-       //td.LinkEndChild(tid);\r
 \r
        for(std::vector<identity>::iterator i=m_identities.begin(); i!=m_identities.end(); i++)\r
        {\r
                el=doc->createElement("Identity");\r
-               //TiXmlElement *tr=new TiXmlElement("Identity");\r
                root->appendChild(el);\r
-               //tid->LinkEndChild(tr);\r
 \r
                el->appendChild(XMLCreateCDATAElement(doc,"Name",(*i).m_name));\r
                el->appendChild(XMLCreateTextElement(doc,"PublicKey",(*i).m_publickey));\r
@@ -127,23 +118,9 @@ std::string IdentityExportXML::GetXML()
                el->appendChild(XMLCreateBooleanElement(doc,"PublishTrustList",(*i).m_publishtrustlist));\r
                el->appendChild(XMLCreateBooleanElement(doc,"PublishBoardList",(*i).m_publishboardlist));\r
                el->appendChild(XMLCreateBooleanElement(doc,"PublishFreesite",(*i).m_publishfreesite));\r
-\r
-               //tr->LinkEndChild(XMLCreateCDATAElement("Name",(*i).m_name));\r
-               //tr->LinkEndChild(XMLCreateTextElement("PublicKey",(*i).m_publickey));\r
-               //tr->LinkEndChild(XMLCreateTextElement("PrivateKey",(*i).m_privatekey));\r
-               //tr->LinkEndChild(XMLCreateBooleanElement("SingleUse",(*i).m_singleuse));\r
-               //tr->LinkEndChild(XMLCreateBooleanElement("PublishTrustList",(*i).m_publishtrustlist));\r
-               //tr->LinkEndChild(XMLCreateBooleanElement("PublishBoardList",(*i).m_publishboardlist));\r
-               //tr->LinkEndChild(XMLCreateBooleanElement("PublishFreesite",(*i).m_publishfreesite));\r
        }\r
 \r
-       //td.Accept(&tp);\r
-       //return std::string(tp.CStr());\r
-\r
-       std::string xml;\r
-       xml=GenerateXML(doc);\r
-\r
-       return xml;\r
+       return GenerateXML(doc);\r
 }\r
 \r
 void IdentityExportXML::Initialize()\r
@@ -221,71 +198,4 @@ const bool IdentityExportXML::ParseXML(const std::string &xml)
        }\r
 \r
        return parsed;\r
-\r
-       //TiXmlDocument td;\r
-       //td.Parse(xml.c_str());\r
-/*\r
-       if(!td.Error())\r
-       {\r
-               std::string name;\r
-               std::string publickey;\r
-               std::string privatekey;\r
-               bool singleuse=false;\r
-               bool publishtrustlist=false;\r
-               bool publishboardlist=false;\r
-               bool publishfreesite=false;\r
-               TiXmlText *txt;\r
-               TiXmlHandle hnd(&td);\r
-               TiXmlNode *node;\r
-\r
-               Initialize();\r
-\r
-               node=hnd.FirstChild("IdentityExport").FirstChild("Identity").ToElement();\r
-               while(node)\r
-               {\r
-                       name="";\r
-                       publickey="";\r
-                       privatekey="";\r
-                       singleuse=false;\r
-                       publishtrustlist=false;\r
-                       publishboardlist=false;\r
-                       publishfreesite=false;\r
-\r
-                       TiXmlHandle hnd2(node);\r
-                       txt=hnd2.FirstChild("Name").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               name=txt->ValueStr();\r
-                       }\r
-                       txt=hnd2.FirstChild("PublicKey").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               publickey=txt->ValueStr();\r
-                       }\r
-                       txt=hnd2.FirstChild("PrivateKey").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               privatekey=txt->ValueStr();\r
-                       }\r
-\r
-                       singleuse=XMLGetBooleanElement(node->ToElement(),"SingleUse");\r
-                       publishtrustlist=XMLGetBooleanElement(node->ToElement(),"PublishTrustList");\r
-                       publishboardlist=XMLGetBooleanElement(node->ToElement(),"PublishBoardList");\r
-                       publishfreesite=XMLGetBooleanElement(node->ToElement(),"PublishFreesite");\r
-\r
-                       if(name!="" && publickey!="" && privatekey!="")\r
-                       {\r
-                               m_identities.push_back(identity(name,publickey,privatekey,singleuse,publishtrustlist,publishboardlist,publishfreesite));\r
-                       }\r
-                       \r
-                       node=node->NextSibling("Identity");\r
-               }\r
-               return true;\r
-\r
-       }\r
-       else\r
-       {\r
-               return false;\r
-       }\r
-*/\r
 }\r