X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistinserter.cpp;h=2d14f894519abdbddc7e21e9e5182c8b374f1506;hb=ee580d19b7920904587e18d72a3465d52eab6204;hp=b22453db4053089715524a2e829bd5a88d1af00f;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/trustlistinserter.cpp b/src/freenet/trustlistinserter.cpp
index b22453d..2d14f89 100644
--- a/src/freenet/trustlistinserter.cpp
+++ b/src/freenet/trustlistinserter.cpp
@@ -21,7 +21,13 @@ void TrustListInserter::CheckForNeededInsert()
 {
 	DateTime date;
 	date.SetToGMTime();
-	date.Add(0,0,-1);
+	int currentday=date.GetDay();
+	date.Add(0,0,-6);
+	// insert trust lists every 6 hours - if 6 hours ago was different day then set to midnight of current day to insert list today ASAP
+	if(currentday!=date.GetDay())
+	{
+		date.Set(date.GetYear(),date.GetMonth(),currentday);
+	}
 	SQLite3DB::Recordset rs=m_db->Query("SELECT LocalIdentityID, PrivateKey FROM tblLocalIdentity WHERE PrivateKey IS NOT NULL AND PrivateKey <> '' AND PublishTrustList='true' AND InsertingTrustList='false' AND (LastInsertedTrustList<='"+date.Format("%Y-%m-%d %H:%M:%S")+"' OR LastInsertedTrustList IS NULL);");
 
 	if(rs.Empty()==false)
@@ -142,8 +148,22 @@ void TrustListInserter::StartInsert(const long localidentityid, const std::strin
 	while(st.RowReturned())
 	{
 		st.ResultText(0,publickey);
-		st.ResultInt(1,messagetrust);
-		st.ResultInt(2,trustlisttrust);
+		if(st.ResultNull(1)==false)
+		{
+			st.ResultInt(1,messagetrust);
+		}
+		else
+		{
+			messagetrust=-1;
+		}
+		if(st.ResultNull(2)==false)
+		{
+			st.ResultInt(2,trustlisttrust);
+		}
+		else
+		{
+			trustlisttrust=-1;
+		}
 		xml.AddTrust(publickey,messagetrust,trustlisttrust);
 		st.Step();
 	}