version 0.3.2

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

diff --git a/src/freenet/trustlistxml.cpp b/src/freenet/trustlistxml.cpp
index 9132427..95d3c5e 100644 (file)
--- a/src/freenet/trustlistxml.cpp
+++ b/src/freenet/trustlistxml.cpp
@@ -80,16 +80,9 @@ std::string TrustListXML::GetTrustListTrustComment(const long index)
 std::string TrustListXML::GetXML()\r
 {\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("TrustList");\r
-       //TiXmlElement *tid;\r
-       //TiXmlPrinter tp;\r
+       Poco::AutoPtr<Poco::XML::Element> root=doc->createElement("TrustList");\r
 \r
        doc->appendChild(root);\r
-       //td.LinkEndChild(tdec);\r
-       //tid=new TiXmlElement("TrustList");\r
-       //td.LinkEndChild(tid);\r
 \r
        for(std::vector<trust>::iterator i=m_trust.begin(); i!=m_trust.end(); i++)\r
        {\r
@@ -97,36 +90,27 @@ std::string TrustListXML::GetXML()
                std::string trustlisttrust;\r
                StringFunctions::Convert((*i).m_messagetrust,messagetrust);\r
                StringFunctions::Convert((*i).m_trustlisttrust,trustlisttrust);\r
-               Poco::XML::Element *tr=doc->createElement("Trust");\r
-               //TiXmlElement *tr=new TiXmlElement("Trust");\r
+               Poco::AutoPtr<Poco::XML::Element> tr=doc->createElement("Trust");\r
                root->appendChild(tr);\r
-               //tid->LinkEndChild(tr);\r
                tr->appendChild(XMLCreateCDATAElement(doc,"Identity",(*i).m_identity));\r
-               //tr->LinkEndChild(XMLCreateCDATAElement("Identity",(*i).m_identity));\r
                if((*i).m_messagetrust>=0)\r
                {\r
                        tr->appendChild(XMLCreateTextElement(doc,"MessageTrustLevel",messagetrust));\r
-                       //tr->LinkEndChild(XMLCreateTextElement("MessageTrustLevel",messagetrust));\r
                }\r
                if((*i).m_trustlisttrust>=0)\r
                {\r
                        tr->appendChild(XMLCreateTextElement(doc,"TrustListTrustLevel",trustlisttrust));\r
-                       //tr->LinkEndChild(XMLCreateTextElement("TrustListTrustLevel",trustlisttrust));\r
                }\r
                if((*i).m_messagetrustcomment!="")\r
                {\r
                        tr->appendChild(XMLCreateTextElement(doc,"MessageTrustComment",(*i).m_messagetrustcomment));\r
-                       //tr->LinkEndChild(XMLCreateCDATAElement("MessageTrustComment",(*i).m_messagetrustcomment));\r
                }\r
                if((*i).m_trustlisttrustcomment!="")\r
                {\r
                        tr->appendChild(XMLCreateTextElement(doc,"TrustListTrustComment",(*i).m_trustlisttrustcomment));\r
-                       //tr->LinkEndChild(XMLCreateCDATAElement("TrustListTrustComment",(*i).m_trustlisttrustcomment));\r
                }\r
        }\r
 \r
-       //td.Accept(&tp);\r
-       //return std::string(tp.CStr());\r
        return GenerateXML(doc);\r
 }\r
 \r
@@ -228,93 +212,4 @@ const bool TrustListXML::ParseXML(const std::string &xml)
        }\r
 \r
        return parsed;\r
-\r
-       /*\r
-       TiXmlDocument td;\r
-       td.Parse(xml.c_str());\r
-\r
-       if(!td.Error())\r
-       {\r
-               std::string identity;\r
-               std::string messagetruststr;\r
-               std::string trustlisttruststr;\r
-               std::string messagetrustcomment="";\r
-               std::string trustlisttrustcomment="";\r
-               long messagetrust;\r
-               long trustlisttrust;\r
-               TiXmlText *txt;\r
-               TiXmlHandle hnd(&td);\r
-               TiXmlNode *node;\r
-               std::vector<std::string> m_foundkeys;\r
-\r
-               Initialize();\r
-\r
-               node=hnd.FirstChild("TrustList").FirstChild("Trust").ToElement();\r
-               while(node)\r
-               {\r
-                       identity="";\r
-                       messagetrust=-1;\r
-                       trustlisttrust=-1;\r
-                       messagetrustcomment="";\r
-                       trustlisttrustcomment="";\r
-\r
-                       TiXmlHandle hnd2(node);\r
-                       txt=hnd2.FirstChild("Identity").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               identity=SanitizeSingleString(txt->ValueStr());\r
-                       }\r
-                       txt=hnd2.FirstChild("MessageTrustLevel").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               messagetruststr=SanitizeSingleString(txt->ValueStr());\r
-                               if(messagetruststr!="")\r
-                               {\r
-                                       StringFunctions::Convert(messagetruststr,messagetrust);\r
-                               }\r
-                       }\r
-                       txt=hnd2.FirstChild("TrustListTrustLevel").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               trustlisttruststr=SanitizeSingleString(txt->ValueStr());\r
-                               if(trustlisttruststr!="")\r
-                               {\r
-                                       StringFunctions::Convert(trustlisttruststr,trustlisttrust);\r
-                               }\r
-                       }\r
-                       txt=hnd2.FirstChild("MessageTrustComment").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               messagetrustcomment=txt->ValueStr();\r
-                       }\r
-                       txt=hnd2.FirstChild("TrustListTrustComment").FirstChild().ToText();\r
-                       if(txt)\r
-                       {\r
-                               trustlisttrustcomment=txt->ValueStr();\r
-                       }\r
-\r
-                       if(identity!="" && messagetrust>=-1 && messagetrust<=100 && trustlisttrust>=-1 && trustlisttrust<=100)\r
-                       {\r
-                               // check so we don't add the same identity multiple times from a trust list\r
-                               if(std::find(m_foundkeys.begin(),m_foundkeys.end(),identity)==m_foundkeys.end())\r
-                               {\r
-                                       m_foundkeys.push_back(identity);\r
-                                       m_trust.push_back(trust(identity,messagetrust,trustlisttrust,messagetrustcomment,trustlisttrustcomment));\r
-                               }\r
-                       }\r
-                       else\r
-                       {\r
-                               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"TrustListXML::ParseXML malformed Trust in TrustList.xml");\r
-                       }\r
-                       \r
-                       node=node->NextSibling("Trust");\r
-               }\r
-               return true;\r
-\r
-       }\r
-       else\r
-       {\r
-               return false;\r
-       }\r
-       */\r
 }\r