X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistinserter.cpp;h=56e70136d824bda8392fb92aeb7d22714d0edb36;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=9307b19272ca6c198cccdc7e20fe1fcf1d997be0;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index 9307b19..56e7013 100644
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -10,12 +10,12 @@
 	#include <xmem.h>
 #endif
 
-MessageListInserter::MessageListInserter()
+MessageListInserter::MessageListInserter(SQLite3DB::DB *db):IIndexInserter<long>(db)
 {
 	Initialize();
 }
 
-MessageListInserter::MessageListInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)
+MessageListInserter::MessageListInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<long>(db,fcp)
 {
 	Initialize();
 }
@@ -60,7 +60,7 @@ void MessageListInserter::CheckForNeededInsert()
 
 }
 
-const bool MessageListInserter::HandlePutFailed(FCPMessage &message)
+const bool MessageListInserter::HandlePutFailed(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 	long localidentityid;
@@ -97,7 +97,7 @@ const bool MessageListInserter::HandlePutFailed(FCPMessage &message)
 
 }
 
-const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message)
+const bool MessageListInserter::HandlePutSuccessful(FCPv2::Message &message)
 {
 	Poco::DateTime now;
 	std::vector<std::string> idparts;
@@ -124,10 +124,19 @@ const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message)
 		st.Bind(1,localidentityid);
 		st.Step();
 
-		// delete any record from tmpMessageListInsert
-		st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE LocalIdentityID=?;");
+		// delete only a single record from tmpMessageListInsert
+		st=m_db->Prepare("SELECT MessageListInsertID FROM tmpMessageListInsert WHERE LocalIdentityID=?;");
 		st.Bind(0,localidentityid);
 		st.Step();
+		if(st.RowReturned())
+		{
+			int id=-1;
+			st.ResultInt(0,id);
+
+			st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE MessageListInsertID=?;");
+			st.Bind(0,id);
+			st.Step();
+		}
 
 		RemoveFromInsertList(localidentityid);
 
@@ -143,17 +152,18 @@ const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message)
 
 void MessageListInserter::Initialize()
 {
-	std::string tempval;
-
+	std::string tempval("");
 	m_fcpuniquename="MessageListInserter";
 	m_daysbackward=0;
-	Option::Instance()->Get("MessageListDaysBackward",tempval);
+	Option option(m_db);
+
+	option.Get("MessageListDaysBackward",tempval);
 	StringFunctions::Convert(tempval,m_daysbackward);
 }
 
 const bool MessageListInserter::StartInsert(const long &localidentityid)
 {
-	FCPMessage message;
+	FCPv2::Message message;
 	Poco::DateTime date;
 	Poco::DateTime now;
 	std::string privatekey;
@@ -168,7 +178,7 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 	date-=Poco::Timespan(m_daysbackward,0,0,0,0);
 	StringFunctions::Convert(localidentityid,localidentityidstr);
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT Day, InsertIndex, MessageXML, PrivateKey FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.LocalIdentityID=? AND Day>=?;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT Day, InsertIndex, MessageXML, PrivateKey FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.LocalIdentityID=? AND Day>=? AND tblMessageInserts.MessageUUID IS NOT NULL;");
 	st.Bind(0,localidentityid);
 	st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d"));
 	st.Step();
@@ -253,10 +263,10 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 		message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+indexstr+"|"+message["URI"];
 		message["UploadFrom"]="direct";
 		message["DataLength"]=xmlsizestr;
-		m_fcp->SendMessage(message);
-		m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());
+		m_fcp->Send(message);
+		m_fcp->Send(std::vector<char>(xmlstr.begin(),xmlstr.end()));
 
-		message.Reset();
+		message.Clear();
 		message.SetName("ClientPutComplexDir");
 		message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y.%m.%d")+"|MessageList/0/";
 		message["Identifier"]=m_fcpuniquename+"USK|"+message["URI"];
@@ -264,8 +274,8 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 		message["Files.0.Name"]="MessageList.xml";
 		message["Files.0.UploadFrom"]="direct";
 		message["Files.0.DataLength"]=xmlsizestr;
-		m_fcp->SendMessage(message);
-		m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());
+		m_fcp->Send(message);
+		m_fcp->Send(std::vector<char>(xmlstr.begin(),xmlstr.end()));
 
 		m_inserting.push_back(localidentityid);
 		m_lastinsertedxml[localidentityid]=xmlstr;