version 0.3.29

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

diff --git a/src/freenet/messageinserter.cpp b/src/freenet/messageinserter.cpp
index 0c03204..f3aab00 100644 (file)
--- a/src/freenet/messageinserter.cpp
+++ b/src/freenet/messageinserter.cpp
@@ -5,12 +5,12 @@
 #include <Poco/DateTimeFormatter.h>\r
 #include <Poco/Timestamp.h>\r
 \r
-MessageInserter::MessageInserter()\r
+MessageInserter::MessageInserter(SQLite3DB::DB *db):IIndexInserter<std::string>(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-MessageInserter::MessageInserter(FCPv2 *fcp):IIndexInserter<std::string>(fcp)\r
+MessageInserter::MessageInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<std::string>(db,fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -46,7 +46,7 @@ void MessageInserter::CheckForNeededInsert()
        }\r
 }\r
 \r
-const bool MessageInserter::HandlePutFailed(FCPMessage &message)\r
+const bool MessageInserter::HandlePutFailed(FCPv2::Message &message)\r
 {\r
        int index;\r
        int localidentityid;\r
@@ -65,12 +65,14 @@ const bool MessageInserter::HandlePutFailed(FCPMessage &message)
                st.Step();\r
        }\r
 \r
+       m_log->trace("MessageInserter::HandlePutFailed error code "+message["Code"]+" fatal="+message["Fatal"]);\r
+\r
        RemoveFromInsertList(idparts[1]);\r
 \r
        return true;\r
 }\r
 \r
-const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)\r
+const bool MessageInserter::HandlePutSuccessful(FCPv2::Message &message)\r
 {\r
        MessageXML xml;\r
        Poco::DateTime date;\r
@@ -147,7 +149,7 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid)
                std::string xmlsizestr;\r
                std::string privatekey;\r
                std::string publickey;\r
-               FCPMessage message;\r
+               FCPv2::Message message;\r
                std::string indexstr;\r
                int index=0;\r
                \r
@@ -206,8 +208,8 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid)
                message["Identifier"]=m_fcpuniquename+"|"+messageuuid+"|"+idstr+"|"+indexstr+"|"+xmlfile.GetMessageID()+"|"+message["URI"];\r
                message["UploadFrom"]="direct";\r
                message["DataLength"]=xmlsizestr;\r
-               m_fcp->SendMessage(message);\r
-               m_fcp->SendRaw(xml.c_str(),xml.size());\r
+               m_fcp->Send(message);\r
+               m_fcp->Send(std::vector<char>(xml.begin(),xml.end()));\r
 \r
                m_inserting.push_back(messageuuid);\r
 \r