Adds immediate migration results in progress

This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071

No files matched your search

@@ -46,10 +46,10 @@ bool HandlerPresentation::init()
};
if (!m_mainHandler->db()->select(cb))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
DEBUG_LOG() << "m_objectPresentationMap.size() = " << m_objectPresentationMap.size();
DEBUG_LOG(m_logger) << "m_objectPresentationMap.size() = " << m_objectPresentationMap.size();
}
{
@@ -59,7 +59,7 @@ bool HandlerPresentation::init()
ObjectPresentation *objPre = m_objectPresentationMap.value(data.presentationId);
if (!objPre || !objPre->isValid())
{
WARNING_LOG() << "Cannot find presentation Id = " << data.presentationId
WARNING_LOG(m_logger) << "Cannot find presentation Id = " << data.presentationId
<< " for presentationContent " << data.id;
return;
}
@@ -67,7 +67,7 @@ bool HandlerPresentation::init()
};
if (!m_mainHandler->db()->select(cb))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
}
@@ -83,10 +83,10 @@ bool HandlerPresentation::init()
void HandlerPresentation::onPresentationModifyRequest(const rti::core::SampleIdentity &cookie,
const PresentationModifyRequest &request)
{
DEBUG_LOG() << "onPresentationModifyRequest: " << request;
DEBUG_LOG(m_logger) << "onPresentationModifyRequest: " << request;
auto ret = request.id() > 0 ? presentationModifyRequest(request) : presentationCreateRequest(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_mainHandler->dds()->fts()->presentationModifyReply(cookie, ret);
}
@@ -131,7 +131,7 @@ Core::FunctionReplyObject HandlerPresentation::presentationModifyRequest(const P
void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG() << "onPresentationRemoveRequest: " << request;
DEBUG_LOG(m_logger) << "onPresentationRemoveRequest: " << request;
Core::FunctionReplyObject ret;
int presentationId = request.id();
@@ -151,10 +151,10 @@ void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIde
return;
}
DEBUG_LOG() << "Deleting presentation id = " << presentationId;
DEBUG_LOG(m_logger) << "Deleting presentation id = " << presentationId;
ret = ifs->removeObject(); // removes all from db due to fk
if (ret.error())
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
// delete ObjectPresentation (including Map)
delete ifs;
@@ -211,7 +211,7 @@ void HandlerPresentation::onPresentationChangeStatusRequest(const rti::core::Sam
}
Core::FunctionReplyObject ret = ifs->changeStatus(request);
if (ret.error())
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
m_mainHandler->dds()->fts()->presentationChangeStatusReply(cookie, ret);
}