Initialize();\r
}\r
\r
-MessageListInserter::MessageListInserter(FCPv2 *fcp):IIndexInserter(fcp)\r
+MessageListInserter::MessageListInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)\r
{\r
Initialize();\r
}\r
// only do 1 insert at a time\r
if(m_inserting.size()==0)\r
{\r
+ std::string sql;\r
DateTime now;\r
DateTime previous;\r
\r
\r
previous.Add(0,0,0,-m_daysbackward);\r
\r
- // query for identities that have messages in the past X days and we haven't inserted lists for in the past hour\r
- SQLite3DB::Statement st=m_db->Prepare("SELECT tblLocalIdentity.LocalIdentityID FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID WHERE tblMessageInserts.Day>=? AND (tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='');");\r
+ // query for identities that have messages in the past X days and (we haven't inserted lists for in the past 30 minutes OR identity has a record in tmpMessageListInsert)\r
+ sql="SELECT tblLocalIdentity.LocalIdentityID ";\r
+ sql+="FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID ";\r
+ sql+="WHERE tblMessageInserts.Day>=? AND ((tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='') OR tblLocalIdentity.LocalIdentityID IN (SELECT LocalIdentityID FROM tmpMessageListInsert)) ";\r
+ sql+=";";\r
+\r
+ SQLite3DB::Statement st=m_db->Prepare(sql);\r
st.Bind(0,previous.Format("%Y-%m-%d"));\r
- st.Bind(1,(now-(1.0/24.0)).Format("%Y-%m-%d %H:%M:%S"));\r
+ st.Bind(1,(now-(1.0/48.0)).Format("%Y-%m-%d %H:%M:%S"));\r
st.Step();\r
\r
if(st.RowReturned())\r
st.Bind(1,localidentityid);\r
st.Step();\r
\r
+ // delete any record from tmpMessageListInsert\r
+ st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE LocalIdentityID=?;");\r
+ st.Bind(0,localidentityid);\r
+ st.Step();\r
+\r
RemoveFromInsertList(localidentityid);\r
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutSuccessful successfully inserted MessageList.");\r
+\r
return true;\r
}\r
\r
\r
m_fcpuniquename="MessageListInserter";\r
m_daysbackward=0;\r
- Option::instance()->Get("MessageListDaysBackward",tempval);\r
+ Option::Instance()->Get("MessageListDaysBackward",tempval);\r
StringFunctions::Convert(tempval,m_daysbackward);\r
}\r
\r
}\r
st.Finalize();\r
\r
+\r
+ st=m_db->Prepare("SELECT MessageDate, MessageIndex, PublicKey, MessageID FROM tblMessage INNER JOIN tblIdentity ON tblMessage.IdentityID=tblIdentity.IdentityID WHERE MessageIndex IS NOT NULL ORDER BY MessageDate DESC, MessageTime DESC LIMIT 100;");\r
+ SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardName FROM tblBoard INNER JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblMessageBoard.MessageID=?;");\r
+ st.Step();\r
+ while(st.RowReturned())\r
+ {\r
+ std::string day;\r
+ int index;\r
+ std::string publickey;\r
+ std::vector<std::string> boardlist;\r
+ int messageid;\r
+ \r
+ st.ResultText(0,day);\r
+ st.ResultInt(1,index);\r
+ st.ResultText(2,publickey);\r
+ st.ResultInt(3,messageid);\r
+\r
+ st2.Bind(0,messageid);\r
+ st2.Step();\r
+ while(st2.RowReturned())\r
+ {\r
+ std::string boardname="";\r
+ st2.ResultText(0,boardname);\r
+ StringFunctions::LowerCase(boardname,boardname);\r
+ boardlist.push_back(boardname);\r
+ st2.Step();\r
+ }\r
+ st2.Reset();\r
+\r
+ mlxml.AddExternalMessage(publickey,day,index,boardlist);\r
+\r
+ st.Step();\r
+ }\r
+\r
// get last inserted messagelist index for this day\r
index=0;\r
st=m_db->Prepare("SELECT MAX(InsertIndex) FROM tblMessageListInserts WHERE LocalIdentityID=? AND Day=?;");\r