version 0.3.29

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

diff --git a/src/freenet/identityinserter.cpp b/src/freenet/identityinserter.cpp
index f28a738..1ae04a5 100644 (file)
--- a/src/freenet/identityinserter.cpp
+++ b/src/freenet/identityinserter.cpp
@@ -10,12 +10,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-IdentityInserter::IdentityInserter()\r
+IdentityInserter::IdentityInserter(SQLite3DB::DB *db):IDatabase(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-IdentityInserter::IdentityInserter(FCPv2 *fcp):IFCPConnected(fcp)\r
+IdentityInserter::IdentityInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -55,7 +55,7 @@ void IdentityInserter::FCPDisconnected()
        \r
 }\r
 \r
-const bool IdentityInserter::HandleMessage(FCPMessage &message)\r
+const bool IdentityInserter::HandleMessage(FCPv2::Message &message)\r
 {\r
 \r
        if(message["Identifier"].find("IdentityInserter")==0)\r
@@ -154,7 +154,7 @@ void IdentityInserter::StartInsert(const long localidentityid)
        if(rs.Empty()==false)\r
        {\r
                IdentityXML idxml;\r
-               FCPMessage mess;\r
+               FCPv2::Message mess;\r
                Poco::DateTime now;\r
                std::string messagebase;\r
                std::string data;\r
@@ -184,7 +184,8 @@ void IdentityInserter::StartInsert(const long localidentityid)
                }\r
                StringFunctions::Convert(index,indexstr);\r
 \r
-               Option::Instance()->Get("MessageBase",messagebase);\r
+               Option option(m_db);\r
+               option.Get("MessageBase",messagebase);\r
 \r
                if(rs.GetField(0))\r
                {\r
@@ -232,8 +233,8 @@ void IdentityInserter::StartInsert(const long localidentityid)
                mess["Identifier"]="IdentityInserter|"+idstring+"|"+indexstr+"|"+mess["URI"];\r
                mess["UploadFrom"]="direct";\r
                mess["DataLength"]=datasizestr;\r
-               m_fcp->SendMessage(mess);\r
-               m_fcp->SendRaw(data.c_str(),data.size());\r
+               m_fcp->Send(mess);\r
+               m_fcp->Send(std::vector<char>(data.begin(),data.end()));\r
 \r
                m_db->Execute("UPDATE tblLocalIdentity SET InsertingIdentity='true' WHERE LocalIdentityID="+idstring+";");\r
 \r