Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -39,9 +39,9 @@ Core::FunctionReplyObject ObjectMarker::createObject(const Marker &data)
|
||||
|
||||
// Neue DB Id in lokale Struktur uebernehmen
|
||||
m_dataMarkerObject.id(dbDataMarker.id);
|
||||
DEBUG_LOG() << "New MarkerId: " << dbDataMarker.id;
|
||||
DEBUG_LOG(m_logger) << "New MarkerId: " << dbDataMarker.id;
|
||||
|
||||
DEBUG_LOG() << "Handle MarkerDescription for markerId:" << dbDataMarker.id << " number of depending descriptions: " << data.descriptions().size();
|
||||
DEBUG_LOG(m_logger) << "Handle MarkerDescription for markerId:" << dbDataMarker.id << " number of depending descriptions: " << data.descriptions().size();
|
||||
|
||||
// Behandlung von MarkerDescription
|
||||
for (size_t i = 0; i < data.descriptions().size(); ++i)
|
||||
@@ -81,10 +81,10 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
|
||||
if (!m_db->update(dbDataMarker))
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating MrkMarker-data into database"));
|
||||
|
||||
DEBUG_LOG() << "Data changed for markerId: " << m_dataMarkerObject.id();
|
||||
DEBUG_LOG(m_logger) << "Data changed for markerId: " << m_dataMarkerObject.id();
|
||||
|
||||
|
||||
INFO_LOG() << "Handle MarkerDescriptions for markerId:" << data.id()
|
||||
INFO_LOG(m_logger) << "Handle MarkerDescriptions for markerId:" << data.id()
|
||||
<< ". Number of pending descriptions (new/previous):"
|
||||
<< data.descriptions().size() << "/" << m_dataMarkerObject.descriptions().size();
|
||||
|
||||
@@ -122,7 +122,7 @@ Core::FunctionReplyObject ObjectMarker::updateObject(const Marker &data)
|
||||
}
|
||||
if (!bFound)
|
||||
{
|
||||
DEBUG_LOG() << "Description with id " << oldDesc.id() << " was removed - removing from db";
|
||||
DEBUG_LOG(m_logger) << "Description with id " << oldDesc.id() << " was removed - removing from db";
|
||||
if (!m_db->removeMrkMarkerDescription(oldDesc.id()))
|
||||
return Core::FunctionReplyObject(data.id(),
|
||||
tr_lts("dds", "MarkerDescription with id %1 can not be removed"))
|
||||
@@ -184,10 +184,10 @@ bool ObjectMarker::isUsed() const
|
||||
|
||||
void ObjectMarker::onPublishData()
|
||||
{
|
||||
INFO_LOG() << "Publish MrkMarker-data to dds markerId:" << m_dataMarkerObject.id() ;
|
||||
INFO_LOG(m_logger) << "Publish MrkMarker-data to dds markerId:" << m_dataMarkerObject.id() ;
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(m_dataMarkerObject))
|
||||
WARNING_LOG() << "Error publishing MrkMarker-data to dds";
|
||||
WARNING_LOG(m_logger) << "Error publishing MrkMarker-data to dds";
|
||||
|
||||
} // end of onPublishData()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user