version 0.3.29

[fms.git] / src / freenet / messagelistrequester.cpp

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 17aba0a..c5cb291 100644 (file)
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -10,12 +10,12 @@
        #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
@@ -136,6 +136,8 @@ const bool MessageListRequester::HandleAllData(FCPv2::Message &message)
        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
@@ -271,6 +273,8 @@ const bool MessageListRequester::HandleAllData(FCPv2::Message &message)
                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
@@ -333,10 +337,11 @@ const bool MessageListRequester::HandleGetFailed(FCPv2::Message &message)
 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
@@ -352,7 +357,7 @@ void MessageListRequester::Initialize()
        }\r
 \r
        tempval="";\r
-       Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+       option.Get("LocalTrustOverridesPeerTrust",tempval);\r
        if(tempval=="true")\r
        {\r
                m_localtrustoverrides=true;\r
@@ -363,7 +368,7 @@ void MessageListRequester::Initialize()
        }\r
 \r
        tempval="";\r
-       Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+       option.Get("SaveMessagesFromNewBoards",tempval);\r
        if(tempval=="true")\r
        {\r
                m_savetonewboards=true;\r
@@ -375,7 +380,7 @@ void MessageListRequester::Initialize()
 \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