version 0.2.16

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

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index b608145..f598b51 100644 (file)
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -24,6 +24,7 @@ void MessageListInserter::CheckForNeededInsert()
                std::string sql;\r
                DateTime now;\r
                DateTime previous;\r
+               bool startedinsert=false;\r
 \r
                now.SetToGMTime();\r
                previous.SetToGMTime();\r
@@ -34,18 +35,19 @@ 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
                st.Bind(1,(now-(1.0/48.0)).Format("%Y-%m-%d %H:%M:%S"));\r
                st.Step();\r
 \r
-               if(st.RowReturned())\r
+               while(st.RowReturned() && startedinsert==false)\r
                {\r
                        int localidentityid;\r
                        st.ResultInt(0,localidentityid);\r
-                       StartInsert(localidentityid);\r
+                       startedinsert=StartInsert(localidentityid);\r
+                       st.Step();\r
                }\r
        }\r
 \r
@@ -121,7 +123,7 @@ void MessageListInserter::Initialize()
        StringFunctions::Convert(tempval,m_daysbackward);\r
 }\r
 \r
-void MessageListInserter::StartInsert(const long &localidentityid)\r
+const bool MessageListInserter::StartInsert(const long &localidentityid)\r
 {\r
        FCPMessage message;\r
        DateTime date;\r
@@ -165,6 +167,40 @@ void MessageListInserter::StartInsert(const long &localidentityid)
        }\r
        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 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
+       {\r
+               std::string day;\r
+               int index;\r
+               std::string publickey;\r
+               std::vector<std::string> boardlist;\r
+               int messageid;\r
+               \r
+               st.ResultText(0,day);\r
+               st.ResultInt(1,index);\r
+               st.ResultText(2,publickey);\r
+               st.ResultInt(3,messageid);\r
+\r
+               st2.Bind(0,messageid);\r
+               st2.Step();\r
+               while(st2.RowReturned())\r
+               {\r
+                       std::string boardname="";\r
+                       st2.ResultText(0,boardname);\r
+                       StringFunctions::LowerCase(boardname,boardname);\r
+                       boardlist.push_back(boardname);\r
+                       st2.Step();\r
+               }\r
+               st2.Reset();\r
+\r
+               mlxml.AddExternalMessage(publickey,day,index,boardlist);\r
+\r
+               st.Step();\r
+       }\r
+\r
        // get last inserted messagelist index for this day\r
        index=0;\r
        st=m_db->Prepare("SELECT MAX(InsertIndex) FROM tblMessageListInserts WHERE LocalIdentityID=? AND Day=?;");\r
@@ -178,18 +214,50 @@ void MessageListInserter::StartInsert(const long &localidentityid)
        }\r
        StringFunctions::Convert(index,indexstr);\r
 \r
-       // actually insert message\r
        xmlstr=mlxml.GetXML();\r
-       StringFunctions::Convert(xmlstr.size(),xmlsizestr);\r
 \r
-       message.SetName("ClientPut");\r
-       message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|MessageList|"+indexstr+".xml";\r
-       message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+indexstr+"|"+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
+       // 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
+               message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|MessageList|"+indexstr+".xml";\r
+               message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+indexstr+"|"+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
+               /*\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
+       {\r
+               return false;\r
+       }\r
 \r
 }\r