version 0.3.32

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

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index eb943ff..2e11d8d 100644 (file)
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -213,22 +213,24 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
        st.Finalize();\r
 \r
 \r
-       st=m_db->Prepare("SELECT MessageDate, MessageIndex, PublicKey, MessageID FROM tblMessage INNER JOIN tblIdentity ON tblMessage.IdentityID=tblIdentity.IdentityID WHERE MessageIndex IS NOT NULL ORDER BY MessageDate DESC, MessageTime DESC LIMIT 175;");\r
+       st=m_db->Prepare("SELECT MessageDate, MessageIndex, PublicKey, MessageID, InsertDate FROM tblMessage INNER JOIN tblIdentity ON tblMessage.IdentityID=tblIdentity.IdentityID WHERE MessageIndex IS NOT NULL ORDER BY MessageDate DESC, MessageTime DESC LIMIT 175;");\r
        SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardName FROM tblBoard INNER JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblMessageBoard.MessageID=?;");\r
        st.Step();\r
 \r
        while(st.RowReturned())\r
        {\r
-               std::string day;\r
-               int index;\r
-               std::string publickey;\r
+               std::string day="";\r
+               int index=0;\r
+               std::string publickey="";\r
                std::vector<std::string> boardlist;\r
-               int messageid;\r
+               int messageid=0;\r
+               std::string insertdate="";\r
                \r
                st.ResultText(0,day);\r
                st.ResultInt(1,index);\r
                st.ResultText(2,publickey);\r
                st.ResultInt(3,messageid);\r
+               st.ResultText(4,insertdate);\r
 \r
                st2.Bind(0,messageid);\r
                st2.Step();\r
@@ -242,7 +244,15 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
                }\r
                st2.Reset();\r
 \r
-               mlxml.AddExternalMessage(publickey,day,index,boardlist);\r
+               // TODO - remove insertdate empty check sometime after 0.3.32 release and get rid of using day\r
+               if(insertdate!="")\r
+               {\r
+                       mlxml.AddExternalMessage(publickey,insertdate,index,boardlist);\r
+               }\r
+               else\r
+               {\r
+                       mlxml.AddExternalMessage(publickey,day,index,boardlist);\r
+               }\r
 \r
                st.Step();\r
        }\r