version 0.3.29

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

diff --git a/src/freenet/messageinserter.cpp b/src/freenet/messageinserter.cpp
index e1a5211..f3aab00 100644 (file)
--- a/src/freenet/messageinserter.cpp
+++ b/src/freenet/messageinserter.cpp
@@ -1,26 +1,29 @@
 #include "../../include/freenet/messageinserter.h"\r
 #include "../../include/freenet/messagexml.h"\r
 \r
-MessageInserter::MessageInserter()\r
+#include <Poco/DateTime.h>\r
+#include <Poco/DateTimeFormatter.h>\r
+#include <Poco/Timestamp.h>\r
+\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
 \r
 void MessageInserter::CheckForNeededInsert()\r
 {\r
-       DateTime now;\r
-       now.SetToGMTime();\r
+       Poco::DateTime now;\r
        bool didinsert=false;\r
        // only do 1 insert at a time\r
        if(m_inserting.size()==0)\r
        {\r
                SQLite3DB::Statement st=m_db->Prepare("SELECT MessageUUID FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.PrivateKey IS NOT NULL AND tblLocalIdentity.PrivateKey <> '' AND tblMessageInserts.Inserted='false' AND tblMessageInserts.SendDate<=?;");\r
-               st.Bind(0,now.Format("%Y-%m-%d %H:%M:%S"));\r
+               st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
                st.Step();\r
 \r
                while(st.RowReturned() && m_inserting.size()==0)\r
@@ -43,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
@@ -62,15 +65,17 @@ 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
-       DateTime date;\r
+       Poco::DateTime date;\r
        int localidentityid;\r
        int index;\r
        std::vector<std::string> idparts;\r
@@ -86,10 +91,10 @@ const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
        st.Step();\r
 \r
        // insert record into temp table so MessageList will be inserted ASAP\r
-       date.SetToGMTime();\r
+       date=Poco::Timestamp();\r
        st=m_db->Prepare("INSERT INTO tmpMessageListInsert(LocalIdentityID,Date) VALUES(?,?);");\r
        st.Bind(0,localidentityid);\r
-       st.Bind(1,date.Format("%Y-%m-%d"));\r
+       st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d"));\r
        st.Step();\r
 \r
        // update the messageuuid to the real messageuuid\r
@@ -118,7 +123,7 @@ const bool MessageInserter::HandlePutSuccessful(FCPMessage &message)
 \r
        RemoveFromInsertList(idparts[1]);\r
 \r
-       m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::HandlePutSuccessful successfully inserted message "+message["Identifier"]);\r
+       m_log->debug("MessageInserter::HandlePutSuccessful successfully inserted message "+message["Identifier"]);\r
 \r
        return true;\r
 }\r
@@ -131,8 +136,7 @@ void MessageInserter::Initialize()
 const bool MessageInserter::StartInsert(const std::string &messageuuid)\r
 {\r
        MessageXML xmlfile;\r
-       DateTime now;\r
-       now.SetToGMTime();\r
+       Poco::DateTime now;\r
        SQLite3DB::Statement st=m_db->Prepare("SELECT MessageXML,PrivateKey,tblLocalIdentity.LocalIdentityID,PublicKey FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE MessageUUID=?;");\r
        st.Bind(0,messageuuid);\r
        st.Step();\r
@@ -145,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
@@ -156,7 +160,7 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid)
                StringFunctions::Convert(localidentityid,idstr);\r
 \r
                st=m_db->Prepare("SELECT MAX(InsertIndex) FROM tblMessageInserts WHERE Day=? AND LocalIdentityID=?;");\r
-               st.Bind(0,now.Format("%Y-%m-%d"));\r
+               st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d"));\r
                st.Bind(1,localidentityid);\r
                st.Step();\r
 \r
@@ -200,16 +204,16 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid)
                StringFunctions::Convert(xml.size(),xmlsizestr);\r
 \r
                message.SetName("ClientPut");\r
-               message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|Message|"+indexstr+".xml";\r
+               message["URI"]=privatekey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|Message|"+indexstr+".xml";\r
                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
-               m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::StartInsert started message insert "+message["URI"]);\r
+               m_log->debug("MessageInserter::StartInsert started message insert "+message["URI"]);\r
        \r
                return true;\r
        }\r