Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+13
-13
@@ -39,7 +39,7 @@ Core::FunctionReplyObject ObjectEffectShow::createObject(const Database::EsmEffe
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EffectShow into database"));
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "createObject(db) complete ->"
|
||||
DEBUG_LOG(m_logger) << "createObject(db) complete ->"
|
||||
<< "\n id " << m_data.id
|
||||
<< "\n centerPosition " << LtsCoordTrans::mgrsFromGeographic(m_data.centerPosition.x(), m_data.centerPosition.y())
|
||||
<< "\n idAreaEffectSimulation " << m_data.idAreaEffectSimulation
|
||||
@@ -79,7 +79,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
|
||||
if (m_data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution)
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Changes rejected due to Effect Show in execution."));
|
||||
|
||||
DEBUG_LOG() << "updateObject(data topic) complete ->"
|
||||
DEBUG_LOG(m_logger) << "updateObject(data topic) complete ->"
|
||||
<< "\n id " << m_data.id << " new: " << data.id()
|
||||
<< "\n centerPosition x " << m_data.centerPosition.x() << " new: " << data.position().lon()
|
||||
<< "\n centerPosition y " << m_data.centerPosition.y() << " new: " << data.position().lat()
|
||||
@@ -120,7 +120,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Error updating EffectShow into database"));
|
||||
|
||||
DEBUG_LOG() << "Data changed for EffectShow Id: " << m_data.id;
|
||||
DEBUG_LOG(m_logger) << "Data changed for EffectShow Id: " << m_data.id;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
@@ -130,7 +130,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem
|
||||
//=============================================================================
|
||||
bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &data)
|
||||
{
|
||||
DEBUG_LOG() << "updateObject() partly ->"
|
||||
DEBUG_LOG(m_logger) << "updateObject() partly ->"
|
||||
<< "\n orderConfirmation " << m_data.orderConfirmation << " new: " << data.confirmation.underlying()
|
||||
<< "\n answerText " << m_data.answerText << " new: " << data.answerText;
|
||||
|
||||
@@ -139,7 +139,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
{
|
||||
ERROR_LOG() << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
|
||||
ERROR_LOG(m_logger) << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d
|
||||
//=============================================================================
|
||||
bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
|
||||
{
|
||||
DEBUG_LOG() << "updateObject(db) complete ->"
|
||||
DEBUG_LOG(m_logger) << "updateObject(db) complete ->"
|
||||
<< "\n id " << m_data.id << " new: " << data.id
|
||||
<< "\n centerPosition x " << m_data.centerPosition.x() << " new: " << data.centerPosition.x()
|
||||
<< "\n centerPosition y " << m_data.centerPosition.y() << " new: " << data.centerPosition.y()
|
||||
@@ -176,7 +176,7 @@ bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data)
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
{
|
||||
ERROR_LOG() << "Failed effect Show updated Id: " << m_data.id;
|
||||
ERROR_LOG(m_logger) << "Failed effect Show updated Id: " << m_data.id;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -194,7 +194,7 @@ bool ObjectEffectShow::resetOrderConfirmation()
|
||||
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
{
|
||||
ERROR_LOG() << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
|
||||
ERROR_LOG(m_logger) << "Effect Show Order Confirmation can_t be updated Id: " << m_data.id;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ ConvertToTab::EffectShowOrder_t ObjectEffectShow::getEffectShowOrder() const
|
||||
order.typeOfAmmunition = m_data.typeOfAmmunition;
|
||||
order.name = m_data.nameAreaEfffectSimulation;
|
||||
|
||||
DEBUG_LOG() << "getEffectShowOrder():"
|
||||
DEBUG_LOG(m_logger) << "getEffectShowOrder():"
|
||||
<< "\n idEffectShow " << order.idEffectShow
|
||||
<< "\n areaDepth " << order.areaDepth
|
||||
<< "\n areaWidth " << order.areaWidth
|
||||
@@ -242,7 +242,7 @@ ConvertToTab::RetractOrder_t ObjectEffectShow::getRetractOrder() const
|
||||
order.id = m_data.id;
|
||||
order.orderType = 1;
|
||||
|
||||
DEBUG_LOG() << "getRetractOrder():"
|
||||
DEBUG_LOG(m_logger) << "getRetractOrder():"
|
||||
<< "\n id " << order.id
|
||||
<< "\n orderType " << (int)order.orderType;
|
||||
return order;
|
||||
@@ -254,7 +254,7 @@ ConvertToTab::EffectShowContinue_t ObjectEffectShow::getContinueOrder() const
|
||||
order.idEffectShow = m_data.id;
|
||||
order.executionTime = m_data.startTime / 1000; // [ms] -> [s]
|
||||
|
||||
DEBUG_LOG() << "getContinueOrder():"
|
||||
DEBUG_LOG(m_logger) << "getContinueOrder():"
|
||||
<< "\n id " << order.idEffectShow
|
||||
<< "\n orderType " << order.executionTime;
|
||||
|
||||
@@ -288,10 +288,10 @@ void ObjectEffectShow::onPublishData()
|
||||
|
||||
|
||||
|
||||
INFO_LOG() << "Publish EsmEffectShow-data to dds (" << m_data.id << ") ...";
|
||||
INFO_LOG(m_logger) << "Publish EsmEffectShow-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(ddsData))
|
||||
ERROR_LOG() << "Error publishing EsmEffectShow-data to dds";
|
||||
ERROR_LOG(m_logger) << "Error publishing EsmEffectShow-data to dds";
|
||||
} // end of onPublishData()
|
||||
//-----------------------------------------------------------------------------
|
||||
} // Namespace EffectShowManagement
|
||||
Reference in new issue
Block a user