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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index c9908a5..980e688 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -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
@@ -301,6 +311,8 @@ 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;