#include <xmem.h>\r
#endif\r
\r
-MessageListRequester::MessageListRequester()\r
+MessageListRequester::MessageListRequester(SQLite3DB::DB *db):IIndexRequester<long>(db)\r
{\r
Initialize();\r
}\r
\r
-MessageListRequester::MessageListRequester(FCPv2::Connection *fcp):IIndexRequester<long>(fcp)\r
+MessageListRequester::MessageListRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<long>(db,fcp)\r
{\r
Initialize();\r
}\r
if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
{\r
\r
+ m_db->Execute("BEGIN;");\r
+\r
SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
SQLite3DB::Statement spk=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey=?;");\r
SQLite3DB::Statement mst=m_db->Prepare("INSERT INTO tblMessageRequests(IdentityID,Day,RequestIndex,FromMessageList) VALUES(?,?,?,'true');");\r
st.Step();\r
st.Finalize();\r
\r
+ m_db->Execute("COMMIT;");\r
+\r
m_log->debug(m_fcpuniquename+"::HandleAllData parsed MessageList XML file : "+message["Identifier"]);\r
}\r
else\r
void MessageListRequester::Initialize()\r
{\r
m_fcpuniquename="ActiveMessageListRequester";\r
- std::string tempval="";\r
-\r
+ std::string tempval("");\r
m_maxrequests=0;\r
- Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);\r
+ Option option(m_db);\r
+\r
+ option.GetInt("MaxMessageListRequests",m_maxrequests);\r
\r
// active identities get 1/2 of the max requests option + any remaining if not evenly divisible - inactive identities get 1/2\r
m_maxrequests=(m_maxrequests/2)+(m_maxrequests%2);\r
}\r
\r
tempval="";\r
- Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+ option.Get("LocalTrustOverridesPeerTrust",tempval);\r
if(tempval=="true")\r
{\r
m_localtrustoverrides=true;\r
}\r
\r
tempval="";\r
- Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+ option.Get("SaveMessagesFromNewBoards",tempval);\r
if(tempval=="true")\r
{\r
m_savetonewboards=true;\r
\r
m_messagedownloadmaxdaysbackward=5;\r
tempval="5";\r
- Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);\r
+ option.Get("MessageDownloadMaxDaysBackward",tempval);\r
StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);\r
\r
}\r