version 0.2.4

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

diff --git a/src/freenet/periodicdbmaintenance.cpp b/src/freenet/periodicdbmaintenance.cpp
index f6f501b..2ac1e07 100644 (file)
--- a/src/freenet/periodicdbmaintenance.cpp
+++ b/src/freenet/periodicdbmaintenance.cpp
@@ -82,7 +82,19 @@ void PeriodicDBMaintenance::Do1HourMaintenance()
                st.Step();\r
        }\r
 \r
-\r
+       // set null peer trust for identities without a calculated trust\r
+       st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE IdentityID NOT IN (SELECT TargetIdentityID FROM vwCalculatedPeerTrust);");\r
+       upd=m_db->Prepare("UPDATE tblIdentity SET PeerMessageTrust=NULL, PeerTrustListTrust=NULL WHERE IdentityID=?;");\r
+       st.Step();\r
+       while(st.RowReturned())\r
+       {\r
+               int identityid=0;\r
+               st.ResultInt(0,identityid);\r
+               upd.Bind(0,identityid);\r
+               upd.Step();\r
+               upd.Reset();\r
+               st.Step();\r
+       }\r
 \r
        m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do1HourMaintenance");\r
 }\r
@@ -90,6 +102,34 @@ void PeriodicDBMaintenance::Do1HourMaintenance()
 void PeriodicDBMaintenance::Do6HourMaintenance()\r
 {\r
 \r
+       // if we remove a board and the reply boardid is still set to it, we need to replace it with a boardid that does exist\r
+       SQLite3DB::Statement st=m_db->Prepare("SELECT MessageID FROM tblMessage WHERE ReplyBoardID NOT IN (SELECT BoardID FROM tblBoard);");\r
+       SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardID FROM tblMessageBoard WHERE MessageID=?;");\r
+       SQLite3DB::Statement upd=m_db->Prepare("UPDATE tblMessage SET ReplyBoardID=? WHERE MessageID=?;");\r
+       st.Step();\r
+       while(st.RowReturned())\r
+       {\r
+               // find a valid boardid for the message\r
+               int messageid=0;\r
+               int boardid=0;\r
+\r
+               st.ResultInt(0,messageid);\r
+\r
+               st2.Bind(0,messageid);\r
+               st2.Step();\r
+               if(st2.RowReturned())\r
+               {\r
+                       st2.ResultInt(0,boardid);\r
+                       upd.Bind(0,boardid);\r
+                       upd.Bind(1,messageid);\r
+                       upd.Step();\r
+                       upd.Reset();\r
+               }\r
+               st2.Reset();\r
+               \r
+               st.Step();\r
+       }\r
+\r
        m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"PeriodicDBMaintenance::Do6HourMaintenance");\r
 }\r
 \r