version 0.2.17

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

diff --git a/src/freenet/messageinserter.cpp b/src/freenet/messageinserter.cpp
index b4e1ce4..e1a5211 100644 (file)
--- a/src/freenet/messageinserter.cpp
+++ b/src/freenet/messageinserter.cpp
@@ -13,11 +13,14 @@ MessageInserter::MessageInserter(FCPv2 *fcp):IIndexInserter<std::string>(fcp)
 \r
 void MessageInserter::CheckForNeededInsert()\r
 {\r
+       DateTime now;\r
+       now.SetToGMTime();\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';");\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.Step();\r
 \r
                while(st.RowReturned() && m_inserting.size()==0)\r
@@ -125,7 +128,7 @@ void MessageInserter::Initialize()
        m_fcpuniquename="MessageInserter";\r
 }\r
 \r
-void MessageInserter::StartInsert(const std::string &messageuuid)\r
+const bool MessageInserter::StartInsert(const std::string &messageuuid)\r
 {\r
        MessageXML xmlfile;\r
        DateTime now;\r
@@ -207,6 +210,12 @@ void MessageInserter::StartInsert(const std::string &messageuuid)
                m_inserting.push_back(messageuuid);\r
 \r
                m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::StartInsert started message insert "+message["URI"]);\r
+       \r
+               return true;\r
+       }\r
+       else\r
+       {\r
+               return false;\r
        }\r
 \r
 }\r