version 0.2.16

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

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index e0d8957..f598b51 100644 (file)
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -35,7 +35,7 @@ void MessageListInserter::CheckForNeededInsert()
                sql="SELECT tblLocalIdentity.LocalIdentityID ";\r
                sql+="FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID ";\r
                sql+="WHERE tblMessageInserts.Day>=? AND ((tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='') OR tblLocalIdentity.LocalIdentityID IN (SELECT LocalIdentityID FROM tmpMessageListInsert)) ";\r
-               sql+=";";\r
+               sql+="GROUP BY tblLocalIdentity.LocalIdentityID;";\r
 \r
                SQLite3DB::Statement st=m_db->Prepare(sql);\r
                st.Bind(0,previous.Format("%Y-%m-%d"));\r
@@ -168,7 +168,7 @@ 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 100;");\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 200;");\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
        while(st.RowReturned())\r
@@ -214,12 +214,12 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
        }\r
        StringFunctions::Convert(index,indexstr);\r
 \r
-       // actually insert message\r
        xmlstr=mlxml.GetXML();\r
 \r
        // only insert if the last message this identity inserted is different than this message\r
        if(m_lastinsertedxml[localidentityid]!=xmlstr)\r
        {\r
+               std::string targeturi="";\r
                StringFunctions::Convert(xmlstr.size(),xmlsizestr);\r
 \r
                message.SetName("ClientPut");\r
@@ -230,9 +230,29 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
                m_fcp->SendMessage(message);\r
                m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());\r
 \r
-               m_inserting.push_back(localidentityid);\r
+               /*\r
+               // insert a USK redirect to the file we just inserted\r
+               targeturi=message["URI"];\r
+               message.Reset();\r
+               message.SetName("ClientPut");\r
+               message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+now.Format("%Y.%m.%d")+"|MessageList/0/MessageList.xml";\r
+               message["Identifier"]=message["URI"];\r
+               message["UploadFrom"]="redirect";\r
+               message["TargetURI"]=targeturi;\r
+               m_fcp->SendMessage(message);\r
+               */\r
+               message.Reset();\r
+               message.SetName("ClientPut");\r
+               message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+now.Format("%Y.%m.%d")+"|MessageList/0/MessageList.xml";\r
+               message["Identifier"]=message["URI"];\r
+               message["UploadFrom"]="direct";\r
+               message["DataLength"]=xmlsizestr;\r
+               m_fcp->SendMessage(message);\r
+               m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());\r
 \r
+               m_inserting.push_back(localidentityid);\r
                m_lastinsertedxml[localidentityid]=xmlstr;\r
+\r
                return true;\r
        }\r
        else\r