X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=980e688b7eae94c003d5d1a5db60948af8b8db21;hb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;hp=7acb44d9af7119fa76f2206d725d66be5e31eff4;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f;p=fms.git

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 7acb44d..980e688 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -10,7 +10,7 @@ MessageRequester::MessageRequester()
 	Initialize();
 }
 
-MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester(fcp)
+MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)
 {
 	Initialize();
 }
@@ -78,6 +78,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 	MessageXML xml;
 	long identityid;
 	long index;
+	bool inserted=false;
 
 	StringFunctions::Split(message["Identifier"],"|",idparts);
 	StringFunctions::Convert(message["DataLength"],datalength);
@@ -133,32 +134,41 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 		st.Bind(5,xml.GetMessageID());
 		st.Bind(6,GetBoardID(xml.GetReplyBoard()));
 		st.Bind(7,xml.GetBody());
-		st.Step(true);
+		inserted=st.Step(true);
 		int messageid=st.GetLastInsertRowID();
 
-		st=m_db->Prepare("INSERT INTO tblMessageBoard(MessageID,BoardID) VALUES(?,?);");
-		for(std::vector<std::string>::iterator i=boards.begin(); i!=boards.end(); i++)
+		if(inserted==true)
 		{
-			st.Bind(0,messageid);
-			st.Bind(1,GetBoardID((*i)));
-			st.Step();
-			st.Reset();
-		}
-		st.Finalize();
 
-		st=m_db->Prepare("INSERT INTO tblMessageReplyTo(MessageID,ReplyToMessageUUID,ReplyOrder) VALUES(?,?,?);");
-		std::map<long,std::string> replyto=xml.GetInReplyTo();
-		for(std::map<long,std::string>::iterator j=replyto.begin(); j!=replyto.end(); j++)
+			st=m_db->Prepare("INSERT INTO tblMessageBoard(MessageID,BoardID) VALUES(?,?);");
+			for(std::vector<std::string>::iterator i=boards.begin(); i!=boards.end(); i++)
+			{
+				st.Bind(0,messageid);
+				st.Bind(1,GetBoardID((*i)));
+				st.Step();
+				st.Reset();
+			}
+			st.Finalize();
+
+			st=m_db->Prepare("INSERT INTO tblMessageReplyTo(MessageID,ReplyToMessageUUID,ReplyOrder) VALUES(?,?,?);");
+			std::map<long,std::string> replyto=xml.GetInReplyTo();
+			for(std::map<long,std::string>::iterator j=replyto.begin(); j!=replyto.end(); j++)
+			{
+				st.Bind(0,messageid);
+				st.Bind(1,(*j).second);
+				st.Bind(2,(*j).first);
+				st.Step();
+				st.Reset();
+			}
+			st.Finalize();
+
+			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::HandleAllData parsed Message XML file : "+message["Identifier"]);
+
+		}
+		else	// couldn't insert - was already in database
 		{
-			st.Bind(0,messageid);
-			st.Bind(1,(*j).second);
-			st.Bind(2,(*j).first);
-			st.Step();
-			st.Reset();
+			m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database.  "+message["Identifier"]);
 		}
-		st.Finalize();
-
-		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::HandleAllData parsed Message XML file : "+message["Identifier"]);
 
 	}
 	else
@@ -209,7 +219,7 @@ void MessageRequester::Initialize()
 {
 	m_fcpuniquename="MessageRequester";
 	std::string tempval;
-	Option::instance()->Get("MaxMessageRequests",tempval);
+	Option::Instance()->Get("MaxMessageRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -220,7 +230,7 @@ void MessageRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageDownloadMaxDaysBackward",tempval);
+	Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);
 	StringFunctions::Convert(tempval,m_maxdaysbackward);
 	if(m_maxdaysbackward<0)
 	{
@@ -239,13 +249,22 @@ void MessageRequester::PopulateIDList()
 	std::string val1;
 	std::string val2;
 	std::string val3;
+	std::string sql;
 
 	date.SetToGMTime();
 	date.Add(0,0,0,-m_maxdaysbackward);
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT tblIdentity.IdentityID,Day,RequestIndex FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"';");
+	sql="SELECT tblIdentity.IdentityID,Day,RequestIndex ";
+	sql+="FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID ";
+	sql+="WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' ";
+	sql+="AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ";
+	sql+=";";
+
+	SQLite3DB::Statement st=m_db->Prepare(sql);
 	st.Step();
 
+	m_ids.clear();
+
 	while(st.RowReturned())
 	{
 		st.ResultText(0,val1);
@@ -292,8 +311,10 @@ void MessageRequester::StartRequest(const std::string &requestid)
 		m_fcp->SendMessage(message);
 
 		m_requesting.push_back(requestid);
+
+		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::StartRequest requesting "+message["Identifier"]);
 	}
 	
 	m_ids[requestid]=true;
 
-}
\ No newline at end of file
+}