version 0.1.13

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

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 1d20869..77b03b1 100644 (file)
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -96,8 +96,22 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
                        //insert trust for this identity\r
                        trustst.Bind(0,identityid);\r
                        trustst.Bind(1,id);\r
-                       trustst.Bind(2,xml.GetMessageTrust(i));\r
-                       trustst.Bind(3,xml.GetTrustListTrust(i));\r
+                       if(xml.GetMessageTrust(i)==-1)\r
+                       {\r
+                               trustst.Bind(2);\r
+                       }\r
+                       else\r
+                       {\r
+                               trustst.Bind(2,xml.GetMessageTrust(i));\r
+                       }\r
+                       if(xml.GetTrustListTrust(i)==-1)\r
+                       {\r
+                               trustst.Bind(3);\r
+                       }\r
+                       else\r
+                       {\r
+                               trustst.Bind(3,xml.GetTrustListTrust(i));\r
+                       }\r
                        trustst.Step();\r
                        trustst.Reset();\r
 \r
@@ -230,8 +244,8 @@ void TrustListRequester::PopulateIDList()
 \r
        // select identities we want to query (we've seen them today and they are publishing trust list) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)\r
        sql="SELECT IdentityID FROM tblIdentity ";\r
-       sql+="WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";\r
-       sql+="ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;";\r
+       sql+="WHERE Name IS NOT NULL AND Name <> '' AND PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";\r
+       sql+="ORDER BY LocalTrustListTrust DESC, LastSeen;";\r
 \r
        SQLite3DB::Statement st=m_db->Prepare(sql);\r
        st.Step();\r
@@ -274,7 +288,7 @@ void TrustListRequester::Process()
        // this will recheck for ids every minute\r
        DateTime now;\r
        now.SetToGMTime();\r
-       if(m_tempdate<(now-(1.0/1440.0)))\r
+       if(m_ids.size()==0 && m_tempdate<(now-(1.0/1440.0)))\r
        {\r
                PopulateIDList();\r
                m_tempdate=now;\r