Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+8
-8
@@ -34,7 +34,7 @@ bool HandlerCodificationData::init()
|
||||
// read all CodificationDatas from database
|
||||
if (!m_dbHandler->db()->select(dataVec))
|
||||
{
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -47,13 +47,13 @@ bool HandlerCodificationData::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return false;
|
||||
}
|
||||
m_codificationdataObjMap.insert(ifs->getId(), ifs);
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
|
||||
DEBUG_LOG(m_logger) << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -62,10 +62,10 @@ bool HandlerCodificationData::init()
|
||||
void HandlerCodificationData::onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CodificationData &request)
|
||||
{
|
||||
DEBUG_LOG() << "onCodificationDataModifyRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->codificationDataModifyReply(cookie, ret);
|
||||
} // end of onCodificationDataModifyRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -96,14 +96,14 @@ Core::FunctionReplyObject HandlerCodificationData::codificationDataModifyRequest
|
||||
void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onCodificationDataRemoveRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataRemoveRequest: " << request;
|
||||
|
||||
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -117,7 +117,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
|
||||
|
||||
Core::FunctionReplyObject ret = ifs->removeObject();
|
||||
if (ret.error())
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
else
|
||||
{
|
||||
// delete codification object
|
||||
|
||||
Reference in new issue
Block a user