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

@@ -32,14 +32,14 @@ HandlerMarker::~HandlerMarker()
bool HandlerMarker::init()
{
INFO_LOG() << "--- Start MarkerManagement HandlerMarker.";
INFO_LOG(m_logger) << "--- Start MarkerManagement HandlerMarker.";
QVector<Database::MrkMarkerDescription> dataDescriptionVec;
// read all marker from database
if (!m_db->select(dataDescriptionVec))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
@@ -63,7 +63,7 @@ bool HandlerMarker::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -71,15 +71,15 @@ bool HandlerMarker::init()
};
if (!m_db->select(cb) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
DEBUG_LOG() << "m_objectMarkerMap.size() = " << m_objectMarkerMap.size();
DEBUG_LOG(m_logger) << "m_objectMarkerMap.size() = " << m_objectMarkerMap.size();
if (m_ddsHandler->fts() == nullptr)
{
ERROR_LOG() << "m_ddsHandler->fts() == nullptr!";
ERROR_LOG(m_logger) << "m_ddsHandler->fts() == nullptr!";
return false;
}
@@ -90,10 +90,10 @@ bool HandlerMarker::init()
void HandlerMarker::onMarkerModifyRequest(const rti::core::SampleIdentity &cookie,
const Marker &request)
{
DEBUG_LOG() << "MarkerModifyRequest: " << request;
DEBUG_LOG(m_logger) << "MarkerModifyRequest: " << request;
auto ret = request.id() > 0 ? markerModifyRequest(request) : markerCreateRequest(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_ddsHandler->fts()->markerModifyReply(cookie, ret);
}
//-----------------------------------------------------------------------------
@@ -132,10 +132,10 @@ Core::FunctionReplyObject HandlerMarker::markerModifyRequest(const Marker &reque
void HandlerMarker::onMarkerRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG() << "MarkerRemoveRequest: " << request;
DEBUG_LOG(m_logger) << "MarkerRemoveRequest: " << request;
auto ret = markerRemoveRequest(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_ddsHandler->fts()->markerRemoveReply(cookie, ret);
}
//-----------------------------------------------------------------------------