version 0.3.31

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

diff --git a/src/freenet/trustlistinserter.cpp b/src/freenet/trustlistinserter.cpp
index 0851c61..3461078 100644 (file)
--- a/src/freenet/trustlistinserter.cpp
+++ b/src/freenet/trustlistinserter.cpp
@@ -11,12 +11,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-TrustListInserter::TrustListInserter()\r
+TrustListInserter::TrustListInserter(SQLite3DB::DB *db):IDatabase(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-TrustListInserter::TrustListInserter(FCPv2::Connection *fcp):IFCPConnected(fcp)\r
+TrustListInserter::TrustListInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -108,7 +108,8 @@ const bool TrustListInserter::HandleMessage(FCPv2::Message &message)
 \r
 void TrustListInserter::Initialize()\r
 {\r
-       Option::Instance()->Get("MessageBase",m_messagebase);\r
+       Option option(m_db);\r
+       option.Get("MessageBase",m_messagebase);\r
        m_lastchecked=Poco::Timestamp();\r
 }\r
 \r
@@ -260,7 +261,8 @@ void TrustListInserter::StartInsert(const long localidentityid, const std::strin
        m_fcp->Send(message);\r
        m_fcp->Send(std::vector<char>(data.begin(),data.end()));\r
 \r
-       // insert to USK\r
+       // insert to USK - not used, but don't remove code yet\r
+       /*\r
        message.Clear();\r
        message.SetName("ClientPutComplexDir");\r
        message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y.%m.%d")+"|TrustList/0/";\r
@@ -271,6 +273,7 @@ void TrustListInserter::StartInsert(const long localidentityid, const std::strin
        message["Files.0.DataLength"]=datasizestr;\r
        m_fcp->Send(message);\r
        m_fcp->Send(std::vector<char>(data.begin(),data.end()));\r
+       */\r
 \r
        m_db->Execute("UPDATE tblLocalIdentity SET InsertingTrustList='true' WHERE LocalIdentityID="+localidentityidstr+";");\r
 \r