X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fperiodicdbmaintenance.cpp;h=2ac1e07e7b33d4d4f257c4c781aaa925f0f72281;hp=f6f501bd62c6437f14f0cb7304f52c671325265c;hb=8a0a83a78390f22f99d4487cda2569909dfbc28e;hpb=a007770a843aa759763b98288c9432c3906ce5c6

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