X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessageinserter.cpp;h=e1a52114bde16fe09ec6e2353da12d55ace4d485;hb=6836fbb5db8464f56e682989996b2210b14231d0;hp=b4e1ce45a4bf076efd61f1585e113d8f63f15740;hpb=63376b2a82c3f6cdf2df56b1f134bd7df0aaab3a;p=fms.git

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