version 0.3.0

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

diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp
index 69c2e35..a39d1a6 100644 (file)
--- a/src/freenet/boardlistrequester.cpp
+++ b/src/freenet/boardlistrequester.cpp
@@ -1,6 +1,9 @@
 #include "../../include/freenet/boardlistrequester.h"\r
 #include "../../include/freenet/boardlistxml.h"\r
 \r
+#include <Poco/DateTime.h>\r
+#include <Poco/DateTimeFormatter.h>\r
+\r
 #ifdef XMEM\r
        #include <xmem.h>\r
 #endif\r
@@ -47,7 +50,7 @@ std::string BoardListRequester::GetIdentityName(const long identityid)
 \r
 const bool BoardListRequester::HandleAllData(FCPMessage &message)\r
 {      \r
-       DateTime now;\r
+       Poco::DateTime now;\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
        long datalength;\r
@@ -57,7 +60,6 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
        long index;\r
        std::string identityname="";\r
 \r
-       now.SetToGMTime();\r
        StringFunctions::Split(message["Identifier"],"|",idparts);\r
        StringFunctions::Convert(message["DataLength"],datalength);\r
        StringFunctions::Convert(idparts[1],identityid);\r
@@ -113,7 +115,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
                        {\r
                                ins.Bind(0,xml.GetName(i));\r
                                ins.Bind(1,xml.GetDescription(i));\r
-                               ins.Bind(2,now.Format("%Y-%m-%d %H:%M:%S"));\r
+                               ins.Bind(2,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
                                if(m_savemessagesfromnewboards)\r
                                {\r
                                        ins.Bind(3,"true");\r
@@ -136,7 +138,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"BoardListRequester::HandleAllData parsed BoardList XML file : "+message["Identifier"]);\r
+               m_log->debug("BoardListRequester::HandleAllData parsed BoardList XML file : "+message["Identifier"]);\r
        }\r
        else\r
        {\r
@@ -148,7 +150,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"BoardListRequester::HandleAllData error parsing BoardList XML file : "+message["Identifier"]);\r
+               m_log->error("BoardListRequester::HandleAllData error parsing BoardList XML file : "+message["Identifier"]);\r
        }\r
 \r
        // remove this identityid from request list\r
@@ -160,13 +162,11 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
 \r
 const bool BoardListRequester::HandleGetFailed(FCPMessage &message)\r
 {\r
-       DateTime now;\r
        SQLite3DB::Statement st;\r
        std::vector<std::string> idparts;\r
        long identityid;\r
        long index;\r
 \r
-       now.SetToGMTime();\r
        StringFunctions::Split(message["Identifier"],"|",idparts);\r
        StringFunctions::Convert(idparts[1],identityid);\r
        StringFunctions::Convert(idparts[2],index);     \r
@@ -181,7 +181,7 @@ const bool BoardListRequester::HandleGetFailed(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"BoardListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
+               m_log->error("BoardListRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
        }\r
 \r
        // remove this identityid from request list\r
@@ -202,11 +202,11 @@ void BoardListRequester::Initialize()
        if(m_maxrequests<0)\r
        {\r
                m_maxrequests=0;\r
-               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxBoardListRequests is currently set at "+tempval+".  It must be 0 or greater.");\r
+               m_log->error("Option MaxBoardListRequests is currently set at "+tempval+".  It must be 0 or greater.");\r
        }\r
        if(m_maxrequests>100)\r
        {\r
-               m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
+               m_log->warning("Option MaxBoardListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
 \r
        Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
@@ -234,18 +234,17 @@ void BoardListRequester::Initialize()
 void BoardListRequester::PopulateIDList()\r
 {\r
        int id;\r
-       DateTime today;\r
-       today.SetToGMTime();\r
+       Poco::DateTime today;\r
 \r
        SQLite3DB::Statement st;\r
 \r
        if(m_localtrustoverrides==false)\r
        {\r
-               st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+today.Format("%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+               st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(today,"%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
        }\r
        else\r
        {\r
-               st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+today.Format("%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+               st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(today,"%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
        }\r
        st.Step();\r
 \r
@@ -262,7 +261,7 @@ void BoardListRequester::PopulateIDList()
 \r
 void BoardListRequester::StartRequest(const long &identityid)\r
 {\r
-       DateTime now;\r
+       Poco::DateTime now;\r
        FCPMessage message;\r
        std::string publickey;\r
        std::string indexstr;\r
@@ -277,10 +276,8 @@ void BoardListRequester::StartRequest(const long &identityid)
        {\r
                st.ResultText(0,publickey);\r
 \r
-               now.SetToGMTime();\r
-\r
                SQLite3DB::Statement st2=m_db->Prepare("SELECT MAX(RequestIndex) FROM tblBoardListRequests WHERE Day=? AND IdentityID=?;");\r
-               st2.Bind(0,now.Format("%Y-%m-%d"));\r
+               st2.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d"));\r
                st2.Bind(1,identityid);\r
                st2.Step();\r
 \r
@@ -299,7 +296,7 @@ void BoardListRequester::StartRequest(const long &identityid)
                StringFunctions::Convert(identityid,identityidstr);\r
 \r
                message.SetName("ClientGet");\r
-               message["URI"]=publickey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|BoardList|"+indexstr+".xml";\r
+               message["URI"]=publickey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|BoardList|"+indexstr+".xml";\r
                message["Identifier"]=m_fcpuniquename+"|"+identityidstr+"|"+indexstr+"|"+message["URI"];\r
                message["ReturnType"]="direct";\r
                message["MaxSize"]="100000";                    // 100 KB\r