#include "../../include/freenet/trustlistxml.h"\r
#include "../../include/stringfunctions.h"\r
\r
+#include <algorithm>\r
+\r
#ifdef XMEM\r
#include <xmem.h>\r
#endif\r
TiXmlElement *tr=new TiXmlElement("Trust");\r
tid->LinkEndChild(tr);\r
tr->LinkEndChild(XMLCreateCDATAElement("Identity",(*i).m_identity));\r
- tr->LinkEndChild(XMLCreateTextElement("MessageTrustLevel",messagetrust));\r
- tr->LinkEndChild(XMLCreateTextElement("TrustListTrustLevel",trustlisttrust));\r
+ if((*i).m_messagetrust>=0)\r
+ {\r
+ tr->LinkEndChild(XMLCreateTextElement("MessageTrustLevel",messagetrust));\r
+ }\r
+ if((*i).m_trustlisttrust>=0)\r
+ {\r
+ tr->LinkEndChild(XMLCreateTextElement("TrustListTrustLevel",trustlisttrust));\r
+ }\r
}\r
\r
td.Accept(&tp);\r
TiXmlText *txt;\r
TiXmlHandle hnd(&td);\r
TiXmlNode *node;\r
+ std::vector<std::string> m_foundkeys;\r
\r
Initialize();\r
\r
if(txt)\r
{\r
messagetruststr=txt->ValueStr();\r
- StringFunctions::Convert(messagetruststr,messagetrust);\r
+ if(messagetruststr!="")\r
+ {\r
+ StringFunctions::Convert(messagetruststr,messagetrust);\r
+ }\r
}\r
txt=hnd2.FirstChild("TrustListTrustLevel").FirstChild().ToText();\r
if(txt)\r
{\r
trustlisttruststr=txt->ValueStr();\r
- StringFunctions::Convert(trustlisttruststr,trustlisttrust);\r
+ if(trustlisttruststr!="")\r
+ {\r
+ StringFunctions::Convert(trustlisttruststr,trustlisttrust);\r
+ }\r
}\r
\r
- if(identity!="" && messagetrust>=0 && messagetrust<=100 && trustlisttrust>=0 && trustlisttrust<=100)\r
+ if(identity!="" && messagetrust>=-1 && messagetrust<=100 && trustlisttrust>=-1 && trustlisttrust<=100)\r
{\r
- m_trust.push_back(trust(identity,messagetrust,trustlisttrust));\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));\r
+ }\r
}\r
else\r
{\r