#include <xmem.h>\r
#endif\r
\r
-MessageListInserter::MessageListInserter()\r
+MessageListInserter::MessageListInserter(SQLite3DB::DB *db):IIndexInserter<long>(db)\r
{\r
Initialize();\r
}\r
\r
-MessageListInserter::MessageListInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)\r
+MessageListInserter::MessageListInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<long>(db,fcp)\r
{\r
Initialize();\r
}\r
\r
}\r
\r
-const bool MessageListInserter::HandlePutFailed(FCPMessage &message)\r
+const bool MessageListInserter::HandlePutFailed(FCPv2::Message &message)\r
{\r
std::vector<std::string> idparts;\r
long localidentityid;\r
\r
}\r
\r
-const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message)\r
+const bool MessageListInserter::HandlePutSuccessful(FCPv2::Message &message)\r
{\r
Poco::DateTime now;\r
std::vector<std::string> idparts;\r
st.Bind(1,localidentityid);\r
st.Step();\r
\r
- // delete any record from tmpMessageListInsert\r
- st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE LocalIdentityID=?;");\r
+ // delete only a single record from tmpMessageListInsert\r
+ st=m_db->Prepare("SELECT MessageListInsertID FROM tmpMessageListInsert WHERE LocalIdentityID=?;");\r
st.Bind(0,localidentityid);\r
st.Step();\r
+ if(st.RowReturned())\r
+ {\r
+ int id=-1;\r
+ st.ResultInt(0,id);\r
+\r
+ st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE MessageListInsertID=?;");\r
+ st.Bind(0,id);\r
+ st.Step();\r
+ }\r
\r
RemoveFromInsertList(localidentityid);\r
\r
\r
void MessageListInserter::Initialize()\r
{\r
- std::string tempval;\r
-\r
+ std::string tempval("");\r
m_fcpuniquename="MessageListInserter";\r
m_daysbackward=0;\r
- Option::Instance()->Get("MessageListDaysBackward",tempval);\r
+ Option option(m_db);\r
+\r
+ option.Get("MessageListDaysBackward",tempval);\r
StringFunctions::Convert(tempval,m_daysbackward);\r
}\r
\r
const bool MessageListInserter::StartInsert(const long &localidentityid)\r
{\r
- FCPMessage message;\r
+ FCPv2::Message message;\r
Poco::DateTime date;\r
Poco::DateTime now;\r
std::string privatekey;\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
+ m_fcp->Send(message);\r
+ m_fcp->Send(std::vector<char>(xmlstr.begin(),xmlstr.end()));\r
\r
- message.Reset();\r
+ message.Clear();\r
message.SetName("ClientPutComplexDir");\r
message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y.%m.%d")+"|MessageList/0/";\r
message["Identifier"]=m_fcpuniquename+"USK|"+message["URI"];\r
message["Files.0.Name"]="MessageList.xml";\r
message["Files.0.UploadFrom"]="direct";\r
message["Files.0.DataLength"]=xmlsizestr;\r
- m_fcp->SendMessage(message);\r
- m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());\r
+ m_fcp->Send(message);\r
+ m_fcp->Send(std::vector<char>(xmlstr.begin(),xmlstr.end()));\r
\r
m_inserting.push_back(localidentityid);\r
m_lastinsertedxml[localidentityid]=xmlstr;\r