From 853f67b0b7b8121d572cff34d40f7b28cac8f65e Mon Sep 17 00:00:00 2001
From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Sun, 1 Jun 2008 09:06:00 +0200
Subject: [PATCH] version 0.2.20

---
 CMakeLists.txt                       | 5 +++++
 include/global.h                     | 2 +-
 src/freenet/messagelistinserter.cpp  | 8 ++++++++
 src/freenet/messagelistrequester.cpp | 5 +++--
 src/freenet/messagerequester.cpp     | 2 ++
 src/freenet/siteinserter.cpp         | 8 ++++++--
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986d1ba..dad91d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,8 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+IF(COMMAND CMAKE_POLICY)
+	CMAKE_POLICY(SET CMP0003 OLD)
+ENDIF(COMMAND CMAKE_POLICY)
+
 PROJECT(fms)
 
 OPTION(USE_BUNDLED_SQLITE "Use the bundled SQLite3 library." OFF)
diff --git a/include/global.h b/include/global.h
index ad3e445..2bc49ce 100644
--- a/include/global.h
+++ b/include/global.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include "pthreadwrapper/thread.h"
 
-#define FMS_VERSION	"0.2.19"
+#define FMS_VERSION	"0.2.20"
 
 // opens database and creates tables and initial inserts if necessary
 void SetupDB();
diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index 833b556..eb102a1 100644
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -87,6 +87,10 @@ const bool MessageListInserter::HandlePutFailed(FCPMessage &message)
 		// reset the last inserted xml doc to nothing so we will try to insert this one again
 		m_lastinsertedxml[localidentityid]="";
 	}
+	else
+	{
+		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutFailed "+message["Identifier"]);
+	}
 
 	return true;
 
@@ -128,6 +132,10 @@ const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message)
 
 		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutSuccessful successfully inserted MessageList.");
 	}
+	else
+	{
+		m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutSuccessful inserted USK MessageList "+message["Identifier"]);
+	}
 
 	return true;
 }
diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 12ed511..a6d8ba9 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -153,7 +153,7 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
 		st.Step();
 		st.Finalize();
 
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);
+		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageListRequester::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]);
 	}
 
 	// remove this identityid from request list
@@ -289,7 +289,8 @@ void MessageListRequester::StartRequest(const long &id)
 			{
 				st2.ResultInt(0,index);
 				// don't increment index here - the node will let us know if there is a new edition
-				//index++;
+				// 2008-05-31 - well actually the node isn't reliably retreiving the latest edition for USKs, so we DO need to increment the index
+				index++;
 			}
 		}
 		st2.Finalize();
diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index f13d04d..5c95cdb 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -415,6 +415,8 @@ void MessageRequester::PopulateIDList()
 		sql+="AND (tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (tblIdentity.LocalMessageTrust IS NULL AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ";
 	}
 	sql+="AND tblIdentity.Name <> '' ";
+	// sort by day descending - in case there is a bunch of messages on a day that keep timing out, we will eventually get to the next day and hopefully find messages there
+	sql+="ORDER BY tblMessageRequests.Day DESC ";
 	sql+=";";
 
 	SQLite3DB::Statement st=m_db->Prepare(sql);
diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index f7d9ef2..e54a28e 100644
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -22,6 +22,10 @@ void SiteInserter::CheckForNeededInsert()
 	{
 		DateTime date;
 		date.SetToGMTime();
+		date.SetHour(0);
+		date.SetMinute(0);
+		date.SetSecond(0);
+		date.Normalize();
 
 		SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID FROM tblLocalIdentity WHERE PublishFreesite='true' AND (LastInsertedFreesite IS NULL OR LastInsertedFreesite<?);");
 		st.Bind(0,date.Format("%Y-%m-%d"));
@@ -91,8 +95,7 @@ std::string SiteInserter::GenerateIndex(const std::string &htmltemplate, const l
 		st.Step();
 	}
 
-	std::string output=StringFunctions::Replace(htmltemplate,"[CONTENT]",content);
-	return StringFunctions::Replace(output,"[IDENTITYNAME]",SanitizeOutput(name));
+	return StringFunctions::Replace(htmltemplate,"[CONTENT]",content);
 
 }
 
@@ -173,6 +176,7 @@ void SiteInserter::GeneratePages(const long localidentityid, std::string &uskkey
 			htmltemplate.append(data.begin(),data.end());
 
 			htmltemplate=StringFunctions::Replace(htmltemplate,"[LINKS]",GenerateLinks(publishtrustlist,publishboardlist));
+			htmltemplate=StringFunctions::Replace(htmltemplate,"[IDENTITYNAME]",SanitizeOutput(name));
 
 			pages["index.htm"]=GenerateIndex(htmltemplate,localidentityid,name);
 			if(publishtrustlist)
-- 
2.7.4