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

@@ -40,7 +40,7 @@ EvlTests::EvlTests(QObject *parent)
//-----------------------------------------------------------------------------
bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, int criteriumId, int elementId, int sanNineLinerId)
{
INFO_LOG() << "EvlTests::init() "
INFO_LOG(m_logger) << "EvlTests::init() "
<< " domainId:" << domainId
<< " exerciseId:" << exerciseId
<< " testId: " << testId
@@ -54,7 +54,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
m_operatorId = operatorId;
m_sanNineLinerId = sanNineLinerId;
DEBUG_LOG() << "Operator Id = " << m_operatorId;
DEBUG_LOG(m_logger) << "Operator Id = " << m_operatorId;
// initialize DDS
m_ddsConnector.reset(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId));
@@ -63,18 +63,18 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
m_ddsConnector->initPublisherSubscriber();
// Access to FTC
DEBUG_LOG() << "create ftc";
DEBUG_LOG(m_logger) << "create ftc";
m_ftc = Evaluations::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG() << "init ftc";
DEBUG_LOG(m_logger) << "init ftc";
bool bRet = m_ftc->enableAll();
DEBUG_LOG() << "init end - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
// Access to DTC
DEBUG_LOG() << "create dtc";
DEBUG_LOG(m_logger) << "create dtc";
m_dtc = Evaluations::Interface::Dtc::create(m_ddsConnector);
DEBUG_LOG() << "init dtc";
DEBUG_LOG(m_logger) << "init dtc";
bRet = m_dtc->enableAll();
DEBUG_LOG() << "init end - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
return bRet;
} // end of init()
@@ -82,7 +82,7 @@ bool EvlTests::init(int domainId, int exerciseId, int testId, int operatorId, in
//-----------------------------------------------------------------------------
void EvlTests::startTest()
{
INFO_LOG() << "startTest() ******* "
INFO_LOG(m_logger) << "startTest() ******* "
<< " exerciseId: " << m_exerciseId
<< " testId: " << m_testId
<< " criteriumId: " << m_criteriumId
@@ -117,10 +117,10 @@ void EvlTests::startTest()
QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
else
{
ERROR_LOG() << "Unknown test case !";
ERROR_LOG(m_logger) << "Unknown test case !";
failExit();
}
INFO_LOG() << "endTest ******* ";
INFO_LOG(m_logger) << "endTest ******* ";
QTimer::singleShot(0, qApp, QCoreApplication::quit);
} // end of startTest()
@@ -136,10 +136,10 @@ void EvlTests::tryCreateCriterium()
data.description("Test description");
data.operatorId(m_operatorId);
INFO_LOG() << "trying to send EvlCriteriumModifyRequest";
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest";
if (!m_ftc->evlCriteriumModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -156,10 +156,10 @@ void EvlTests::tryModifyCriterium()
data.description("Description modified");
data.operatorId(m_operatorId);
INFO_LOG() << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
INFO_LOG(m_logger) << "trying to send EvlCriteriumModifyRequest for criteriumId:" << data.id();
if (!m_ftc->evlCriteriumModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting modify data for criteriumId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for criteriumId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -173,10 +173,10 @@ void EvlTests::tryRemoveCriterium()
data.id(m_criteriumId);
INFO_LOG() << "trying to send remove request for criteriumId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for criteriumId:" << data.id();
if (!m_ftc->evlCriteriumRemoveRequest(data, this))
{
ERROR_LOG() << "Error requesting remove data for criteriumId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -186,14 +186,14 @@ void EvlTests::tryRemoveCriterium()
void EvlTests::tryGetAllCriteria()
{
m_eTestStep = eGetAllCriteria;
DEBUG_LOG() << "trying to get all criteria";
DEBUG_LOG(m_logger) << "trying to get all criteria";
m_dtc->waitForHistoricalDataEvaluationCriterium(5000);
m_criteriumId = -1;
auto cb = [this] (const Evaluations::EvaluationCriterium &c)
{
m_criteriumId = c.id();
INFO_LOG() << "Evl(" << c.id() << ") :"
INFO_LOG(m_logger) << "Evl(" << c.id() << ") :"
<< " name:" << c.name()
<< " desc:" << c.description()
<< " operatorId:" << c.operatorId();
@@ -201,7 +201,7 @@ void EvlTests::tryGetAllCriteria()
m_dtc->evaluationCriteriums(cb);
if (m_criteriumId == -1)
{
ERROR_LOG() << "Error requesting all criterium data";
ERROR_LOG(m_logger) << "Error requesting all criterium data";
failExit();
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -210,7 +210,7 @@ void EvlTests::tryGetAllCriteria()
//-----------------------------------------------------------------------------
void EvlTests::tryGetCriterium()
{
DEBUG_LOG() << "trying to get criterium with id:" << m_criteriumId;
DEBUG_LOG(m_logger) << "trying to get criterium with id:" << m_criteriumId;
if(m_testId > 1)
{
@@ -219,7 +219,7 @@ void EvlTests::tryGetCriterium()
if (m_criteriumId <= 0)
{
ERROR_LOG() << "invalid criteriumId - test aborted.";
ERROR_LOG(m_logger) << "invalid criteriumId - test aborted.";
failExit();
}
@@ -228,12 +228,12 @@ void EvlTests::tryGetCriterium()
if (data.id() <= 0)
{
ERROR_LOG() << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
ERROR_LOG(m_logger) << "Error receiving data for criteriumId " << m_criteriumId << " returnVal: " << data.id();
failExit();
}
else
{
INFO_LOG() << "Evl(" << data.id() << ") :"
INFO_LOG(m_logger) << "Evl(" << data.id() << ") :"
<< " name:" << data.name()
<< " desc:" << data.description()
<< " operatorId:" << data.operatorId();
@@ -243,7 +243,7 @@ void EvlTests::tryGetCriterium()
{
if (!onCompareCreatedData(data))
{
ERROR_LOG() << "Compare created data failed!";
ERROR_LOG(m_logger) << "Compare created data failed!";
failExit();
}
else
@@ -279,10 +279,10 @@ void EvlTests::tryCreateElement()
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
data.audioContent().set(QJsonDocument(obj).toJson().constData());
INFO_LOG() << "trying to send evlElementModifyRequest";
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest";
if (!m_ftc->evlElementModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -310,10 +310,10 @@ void EvlTests::tryModifyElement()
obj[QStringLiteral("allStreams")] = QJsonValue(QStringLiteral("vhf01, hf01, hf02, vhf03"));
data.audioContent().set(QJsonDocument(obj).toJson().constData());
INFO_LOG() << "trying to send evlElementModifyRequest for elementId:" << data.id();
INFO_LOG(m_logger) << "trying to send evlElementModifyRequest for elementId:" << data.id();
if (!m_ftc->evlElementModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting modify data for snapshotId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting modify data for snapshotId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -328,10 +328,10 @@ void EvlTests::tryRemoveElement()
data.id(m_elementId);
data.criteriumId(m_criteriumId);
INFO_LOG() << "trying to send remove request for elementId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for elementId:" << data.id();
if (!m_ftc->evlElementRemoveRequest(data, this))
{
ERROR_LOG() << "Error requesting remove data for elementId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -402,12 +402,12 @@ void EvlTests::tryCreateSanNineLiner()
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
data.lines(doc.toJson().toStdString());
INFO_LOG() << "lines: " << data.lines();
INFO_LOG(m_logger) << "lines: " << data.lines();
INFO_LOG() << "trying to send sanNineLinerRequest";
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
if (!m_ftc->sanNineLinerModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -477,12 +477,12 @@ void EvlTests::tryModifySanNineLiner()
QJsonDocument doc = SanCategoryLine::toJson(vecCl);
data.lines(doc.toJson().toStdString());
INFO_LOG() << "lines: " << data.lines();
INFO_LOG(m_logger) << "lines: " << data.lines();
INFO_LOG() << "trying to send sanNineLinerRequest";
INFO_LOG(m_logger) << "trying to send sanNineLinerRequest";
if (!m_ftc->sanNineLinerModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
QTest::qWait(1000);
@@ -496,10 +496,10 @@ void EvlTests::tryRemoveSanNineLiner()
data.id(m_sanNineLinerId);
INFO_LOG() << "trying to send remove request for sanNineLinerId:" << data.id();
INFO_LOG(m_logger) << "trying to send remove request for sanNineLinerId:" << data.id();
if (!m_ftc->sanNineLinerRemoveRequest(data, this))
{
ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << data.id();
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << data.id();
failExit();
}
QTest::qWait(1000);
@@ -508,7 +508,7 @@ void EvlTests::tryRemoveSanNineLiner()
//-----------------------------------------------------------------------------
void EvlTests::tryGetSanNineLiner()
{
DEBUG_LOG() << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
DEBUG_LOG(m_logger) << "trying to get sanNineLinerId with id:" << m_sanNineLinerId;
if(m_testId > 1)
{
@@ -517,7 +517,7 @@ void EvlTests::tryGetSanNineLiner()
if (m_sanNineLinerId <= 0)
{
ERROR_LOG() << "invalid sanNineLinerId - test aborted.";
ERROR_LOG(m_logger) << "invalid sanNineLinerId - test aborted.";
failExit();
}
@@ -526,12 +526,12 @@ void EvlTests::tryGetSanNineLiner()
if (data.id() <= 0)
{
ERROR_LOG() << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
ERROR_LOG(m_logger) << "Error receiving data for sanNineLiner " << m_sanNineLinerId << " returnVal: " << data.id();
failExit();
}
else
{
INFO_LOG() << "SanNineLiner(" << data.id() << ") :"
INFO_LOG(m_logger) << "SanNineLiner(" << data.id() << ") :"
<< " lastModified: " << data.lastModified()
<< " position lat: " << data.line1_position().lat()
<< " position lon: " << data.line1_position().lon()
@@ -544,7 +544,7 @@ void EvlTests::tryGetSanNineLiner()
{
if (!onCompareCreatedData(data))
{
ERROR_LOG() << "Compare created data failed!";
ERROR_LOG(m_logger) << "Compare created data failed!";
failExit();
}
else
@@ -562,20 +562,20 @@ void EvlTests::tryGetSanNineLiner()
//-----------------------------------------------------------------------------
void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got onEvlCriteriumModifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_criteriumId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, this, &EvlTests::tryGetCriterium);
@@ -585,18 +585,18 @@ void EvlTests::onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting remove data for criteriumId:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting remove data for criteriumId:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting remove data for criteriumd:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, QCoreApplication::quit);
@@ -606,20 +606,20 @@ void EvlTests::onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got modifyReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got modifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_elementId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting modify data ok. Got id:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -630,18 +630,18 @@ void EvlTests::onEvlElementModifyReply(const Core::FunctionReplyObject &replyObj
//-----------------------------------------------------------------------------
void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting remove data for elementId:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting remove data for elementId:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting remove data for elementId:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -651,20 +651,20 @@ void EvlTests::onEvlElementRemoveReply(const Core::FunctionReplyObject &replyObj
//-----------------------------------------------------------------------------
void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got onSanNineLinerModifyReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got onSanNineLinerModifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_sanNineLinerId = replyObject.id();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting create data ok. Got new id:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, this, &EvlTests::tryGetSanNineLiner);
@@ -673,18 +673,18 @@ void EvlTests::onSanNineLinerModifyReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if (replyObject.error())
{
ERROR_LOG() << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting remove data for sanNineLinerId:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting remove data for sanNineLinerId:" << replyObject.id() << " ... ok.";
}
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
@@ -695,21 +695,21 @@ void EvlTests::onSanNineLinerRemoveReply(const Core::FunctionReplyObject &replyO
//-----------------------------------------------------------------------------
void EvlTests::onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType)
{
INFO_LOG() << "onReceiveCriteriumChanged() criteriumId:" << data.id()
INFO_LOG(m_logger) << "onReceiveCriteriumChanged() criteriumId:" << data.id()
<< " modificationType: = " << (int)modType<< " received";
switch (modType)
{
case DataModification::eAdded:
INFO_LOG() << "*** Criterium added received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium added received. criteriumId:" << data.id();
break;
case DataModification::eModified:
INFO_LOG() << "*** Criterium modified received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium modified received. criteriumId:" << data.id();
break;
case DataModification::eRemoved:
INFO_LOG() << "*** Criterium removed received. criteriumId:" << data.id();
INFO_LOG(m_logger) << "*** Criterium removed received. criteriumId:" << data.id();
break;
}
@@ -736,7 +736,7 @@ void EvlTests::getSanNineLinerModifyRequestData(SanNineLinerModifyRequest &data)
//-----------------------------------------------------------------------------
bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
{
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
@@ -754,7 +754,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
return false;
DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
return true;
} // end of onCompareCreatedData()
@@ -762,7 +762,7 @@ bool EvlTests::onCompareCreatedData(EvaluationCriterium &data)
//-----------------------------------------------------------------------------
bool EvlTests::onCompareCreatedData(SanNineLiner &data)
{
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
SanNineLinerModifyRequest createData;
@@ -774,7 +774,7 @@ bool EvlTests::onCompareCreatedData(SanNineLiner &data)
if (createData.line2_radioFrequencyCallSignSuffix() != data.line2_RadioFrequencyCallSignSuffix())
return false;
DEBUG_LOG() << "successfully finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareCreatedData() for id :" << data.id();
return true;
} // end of onCompareCreatedData()
@@ -72,6 +72,7 @@ protected Q_SLOTS:
void onReceiveCriteriumChanged(const EvaluationCriterium &data, DataModification modType);
protected:
NGL::INGLLogger &m_logger;
// Callbackfunctions for FTC
void onEvlCriteriumModifyReply(const Core::FunctionReplyObject &replyObject) override final;
void onEvlCriteriumRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
@@ -16,14 +16,14 @@ namespace Evaluations
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
: m_ddsConnector(ddsConnector)
{
DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
bool DdsHandler::init(const QStringList &qosFileList)
{
if(!m_ddsConnector->init(qosFileList))
{
ERROR_LOG() << "Error initializing dds connections - aborting";
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
return false;
}
@@ -32,11 +32,11 @@ bool DdsHandler::init(const QStringList &qosFileList)
m_ddsDts = Evaluations::Interface::Dts::create(m_ddsConnector);
bool bRet = m_ddsDts->enableAll();
INFO_LOG() << "Dts initialised";
INFO_LOG(m_logger) << "Dts initialised";
m_ddsFts = Evaluations::Interface::Fts::create(m_ddsConnector);
bRet &= m_ddsFts->enableAll();
INFO_LOG() << "Fts initialised: ";
INFO_LOG(m_logger) << "Fts initialised: ";
return bRet;
}
@@ -28,6 +28,7 @@ public:
std::shared_ptr<Evaluations::Interface::Fts> fts() const { return m_ddsFts; }
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Evaluations::Interface::Dts> m_ddsDts;
std::shared_ptr<Evaluations::Interface::Fts> m_ddsFts;
@@ -37,7 +37,7 @@ bool HandlerComment::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -45,7 +45,7 @@ bool HandlerComment::init()
};
if (!m_db->select(cbComment) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
@@ -58,7 +58,7 @@ bool HandlerComment::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -66,7 +66,7 @@ bool HandlerComment::init()
};
if (!m_db->select(cbSchema) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
@@ -116,7 +116,7 @@ void HandlerComment::onEvlCommentModifyRequest(const rti::core::SampleIdentity &
{
delete ifs;
ifs = nullptr;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
}
else
m_mapObjectComment.insert(ifs->getId(), ifs);
@@ -150,7 +150,7 @@ void HandlerComment::onEvlSchemaModifyRequest(const rti::core::SampleIdentity &c
{
delete ifs;
ifs = nullptr;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
}
else
m_mapObjectSchema.insert(ifs->getId(), ifs);
@@ -30,6 +30,7 @@ public:
bool init();
private:
NGL::INGLLogger &m_logger;
void onEvlCommentModifyRequest(const rti::core::SampleIdentity &cookie,
const EvlCommentModifyRequest &request) override final;
@@ -37,6 +38,7 @@ private:
const EvlSchemaModifyRequest &request) override final;
private:
NGL::INGLLogger &m_logger;
void createDefaultSchema();
QHash<int, ObjectComment *> m_mapObjectComment;
QHash<int, ObjectSchema *> m_mapObjectSchema;
@@ -40,7 +40,7 @@ bool HandlerCriterium::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -48,10 +48,10 @@ bool HandlerCriterium::init()
};
if (!m_db->select(cbCriterim) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
DEBUG_LOG() << "m_criteriumObjMap.size() = " << m_criteriumObjMap.size();
DEBUG_LOG(m_logger) << "m_criteriumObjMap.size() = " << m_criteriumObjMap.size();
auto cbElement = [this, &bRet](const Database::EvlElement & data)
{
@@ -64,7 +64,7 @@ bool HandlerCriterium::init()
if (ret.error())
{
delete oee;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -72,7 +72,7 @@ bool HandlerCriterium::init()
};
if (!m_db->select(cbElement) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
@@ -97,7 +97,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
{
delete ifs;
ifs = nullptr;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
}
else
m_criteriumObjMap.insert(ifs->getId(), ifs);
@@ -115,7 +115,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
void HandlerCriterium::onEvlCriteriumRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG() << "onEvlCriteriumRemoveRequest: " << request;
DEBUG_LOG(m_logger) << "onEvlCriteriumRemoveRequest: " << request;
ObjectCriterium *ifs = m_criteriumObjMap.value(request.id());
Core::FunctionReplyObject ret;
@@ -31,6 +31,7 @@ public:
bool init();
private:
NGL::INGLLogger &m_logger;
void onEvlCriteriumModifyRequest(const rti::core::SampleIdentity &cookie,
const EvlCriteriumModifyRequest &request) override final;
void onEvlCriteriumRemoveRequest(const rti::core::SampleIdentity &cookie,
@@ -41,6 +42,7 @@ private:
const EvlElementRemoveRequest &request) override final;
private:
NGL::INGLLogger &m_logger;
QHash<int, ObjectCriterium *> m_criteriumObjMap;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
@@ -43,7 +43,7 @@ bool HandlerSanNineLiner::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -51,7 +51,7 @@ bool HandlerSanNineLiner::init()
};
if (!m_db->select(cbSanNineLiner) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
@@ -61,7 +61,7 @@ bool HandlerSanNineLiner::init()
ObjectSanNineLiner *objSan = m_mapObjectSanNineLiner.value(data.nineLinerId);
if (!objSan)
{
WARNING_LOG() << "Cannot find nineLiner Id = " << data.nineLinerId
WARNING_LOG(m_logger) << "Cannot find nineLiner Id = " << data.nineLinerId
<< " for categoryLineId " << data.id;
return;
}
@@ -70,7 +70,7 @@ bool HandlerSanNineLiner::init()
if (!m_db->select(cb))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
@@ -96,7 +96,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix());
INFO_LOG() << "lines: " << request.lines();
INFO_LOG(m_logger) << "lines: " << request.lines();
Core::FunctionReplyObject ret;
ObjectSanNineLiner *ifs = nullptr;
@@ -109,7 +109,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
{
delete ifs;
ifs = nullptr;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
}
else
{
@@ -132,22 +132,22 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
// delete old entries
if (!m_db->removeCategoryLinesPerNineLiner(data.id))
ERROR_LOG() << "Error while deleting old entries for nineLinerId " << data.id;
ERROR_LOG(m_logger) << "Error while deleting old entries for nineLinerId " << data.id;
ifs->removeCategoryLines();
// line3 - line9 in object_san_category_line
INFO_LOG() << "data.id: " << data.id;
INFO_LOG(m_logger) << "data.id: " << data.id;
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines(), data.id);
INFO_LOG() << "LinesCategory count: " << linesCategory.count();
INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count();
for (Database::SanCategoryLine cl : std::as_const(linesCategory))
{
ObjectSanCategoryLine *ifsCl(new ObjectSanCategoryLine(m_ddsHandler, m_db));
ret = ifsCl->createObject(cl);
if (ret.error())
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
else
{
cl.id = ifsCl->getId();
@@ -30,6 +30,7 @@ public:
bool init();
private:
NGL::INGLLogger &m_logger;
void onSanNineLinerModifyRequest(const rti::core::SampleIdentity &cookie,
const SanNineLinerModifyRequest &request) override final;
@@ -37,6 +38,7 @@ private:
const Core::RemoveElementRequest &request) override final;
private:
NGL::INGLLogger &m_logger;
QHash<int, ObjectSanNineLiner *> m_mapObjectSanNineLiner;
std::shared_ptr<DdsHandler> m_ddsHandler;
@@ -36,26 +36,26 @@ Initialization::~Initialization()
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
const QSqlDatabase &sqlDb)
{
INFO_LOG() << "Start Evaluations Initialization.";
INFO_LOG(m_logger) << "Start Evaluations Initialization.";
// initialize DDS
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
if (!m_ddsHandler->init())
{
ERROR_LOG() << "Initialisation ddsHandler failed.";
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
return false;
}
DEBUG_LOG() << "Initialisation ddsHandler succesful.";
DEBUG_LOG(m_logger) << "Initialisation ddsHandler succesful.";
// initialize database
m_dbHandler = std::make_shared<DbHandler>();
if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
{
ERROR_LOG() << "Initialisation dbHandler failed.";
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
return false;
}
DEBUG_LOG() << "Initialisation dbHandler succesful.";
DEBUG_LOG(m_logger) << "Initialisation dbHandler succesful.";
// HandlerCriterium
@@ -76,18 +76,18 @@ bool Initialization::loadFromDatabase()
return false;
if (!m_handlerCriterium->init())
{
ERROR_LOG() << "Initialisation HandlerCriterium failed.";
ERROR_LOG(m_logger) << "Initialisation HandlerCriterium failed.";
return false;
}
if (!m_handlerComment->init())
{
ERROR_LOG() << "Initialisation HandlerComment failed.";
ERROR_LOG(m_logger) << "Initialisation HandlerComment failed.";
return false;
}
if (!m_handlerSanNineLiner->init())
{
ERROR_LOG() << "Initialisation HandlerSanNineLiner failed.";
ERROR_LOG(m_logger) << "Initialisation HandlerSanNineLiner failed.";
return false;
}
@@ -31,6 +31,7 @@ public:
bool loadFromDatabase();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DbHandler> m_dbHandler;
std::unique_ptr<HandlerCriterium> m_handlerCriterium;
@@ -64,10 +64,10 @@ void ObjectComment::onPublishData()
ddsData.schemaId(m_data.schemaId);
ddsData.elementId(m_data.elementId);
INFO_LOG() << "Publish EvlComment-data to dds (" << m_data.id << ") ...";
INFO_LOG(m_logger) << "Publish EvlComment-data to dds (" << m_data.id << ") ...";
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG() << "Error publishing EvlComment-data to dds";
ERROR_LOG(m_logger) << "Error publishing EvlComment-data to dds";
}
@@ -133,9 +133,9 @@ void ObjectSchema::onPublishData()
ddsData.schemadata(m_data.schemadata.toStdString());
ddsData.sendToTa(m_data.sendToTa);
INFO_LOG() << "Publish EvlSchema-data to dds (id = " << m_data.id << ", send to training area = " << m_data.sendToTa << ") ...";
INFO_LOG(m_logger) << "Publish EvlSchema-data to dds (id = " << m_data.id << ", send to training area = " << m_data.sendToTa << ") ...";
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG() << "Error publishing EvlSchema-data to dds";
ERROR_LOG(m_logger) << "Error publishing EvlSchema-data to dds";
}
} // Namespace Evaluations
@@ -31,6 +31,7 @@ public:
int getId() const { return m_data.id; }
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
@@ -53,6 +54,7 @@ public:
int getId() const { return m_data.id; }
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
@@ -73,10 +73,10 @@ void ObjectCriterium::onPublishData()
ddsData.description(m_data.description.toStdString());
ddsData.operatorId(m_data.operatorId);
INFO_LOG() << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
INFO_LOG(m_logger) << "Publish EvlCriterium-data to dds (" << m_data.id << ") ...";
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG() << "Error publishing EvlCriterium-data to dds";
ERROR_LOG(m_logger) << "Error publishing EvlCriterium-data to dds";
}
void ObjectCriterium::addElement(ObjectEvaluationElement *oee)
@@ -39,6 +39,7 @@ protected Q_SLOTS:
void onPublishData();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
Database::EvlCriterium m_data;
@@ -75,10 +75,10 @@ void ObjectEvaluationElement::onPublishData()
if (!m_data.situationContent.isNull())
ddsData.situationContent(m_data.situationContent.toString().toStdString());
INFO_LOG() << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
INFO_LOG(m_logger) << "Publish EvlElement-data to dds (" << m_data.id << ") ...";
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG() << "Error publishing EvlEvaluationElement-data to dds";
ERROR_LOG(m_logger) << "Error publishing EvlEvaluationElement-data to dds";
}
} // Namespace Evaluations
@@ -35,6 +35,7 @@ protected Q_SLOTS:
void onPublishData();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
Database::EvlElement m_data;
@@ -19,7 +19,7 @@ ObjectSanCategoryLine::ObjectSanCategoryLine(const std::shared_ptr<DdsHandler> &
Core::FunctionReplyObject ObjectSanCategoryLine::createObject(const Database::SanCategoryLine &data)
{
INFO_LOG() << "SanCategoryLine: nineLiner: " << data.nineLinerId << " line: " << data.line << ", amount: " << data.amount << ", category: " << data.category;
INFO_LOG(m_logger) << "SanCategoryLine: nineLiner: " << data.nineLinerId << " line: " << data.line << ", amount: " << data.amount << ", category: " << data.category;
m_data = data;
if (m_data.id <= 0)
{
@@ -27,7 +27,7 @@ Core::FunctionReplyObject ObjectSanCategoryLine::createObject(const Database::Sa
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting SanCategoryLine-data into database"));
}
INFO_LOG() << "New data id: " << m_data.id;
INFO_LOG(m_logger) << "New data id: " << m_data.id;
return Core::FunctionReplyObject(m_data.id);
}
@@ -31,6 +31,7 @@ public:
int getId() const { return m_data.id; }
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
@@ -76,10 +76,10 @@ void ObjectSanNineLiner::onPublishData()
QJsonDocument doc = SanCategoryLine::toJson(m_lines);
ddsData.lines(QString::fromUtf8(doc.toJson(QJsonDocument::Compact)).toStdString());
INFO_LOG() << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines();
INFO_LOG(m_logger) << "Publish SanNineLiner-data to dds (" << m_data.id << ") other lines: " << ddsData.lines();
if (!m_ddsHandler->dts()->publish(ddsData))
ERROR_LOG() << "Error publishing SanNineLiner-data to dds";
ERROR_LOG(m_logger) << "Error publishing SanNineLiner-data to dds";
}
} // Namespace Evaluations
@@ -35,6 +35,7 @@ public:
void onPublishData();
protected:
NGL::INGLLogger &m_logger;
private:
std::shared_ptr<DdsHandler> m_ddsHandler;
std::shared_ptr<DatabaseInterface> m_db;
@@ -26,13 +26,13 @@ QVector<Database::SanCategoryLine> SanCategoryLine::fromJson(const std::string &
QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromStdString(line), &jError));
if (jError.error)
{
//ERROR_LOG() << "Can not parse json document: " << jError.errorString();
//ERROR_LOG(m_logger) << "Can not parse json document: " << jError.errorString();
return QVector<Database::SanCategoryLine>();
}
const QJsonObject rootObj = doc.object();
const QJsonArray arrCategoryLines(rootObj[QStringLiteral("categoryLines")].toArray());
//INFO_LOG() << "Lines: " << arrCategoryLines.count();
//INFO_LOG(m_logger) << "Lines: " << arrCategoryLines.count();
QVector<Database::SanCategoryLine> categoryLines;
categoryLines.reserve(arrCategoryLines.size());
@@ -63,7 +63,7 @@ QJsonDocument SanCategoryLine::toJson(std::vector<Database::SanCategoryLine> vec
obj[QStringLiteral("amount")] = cl.amount;
obj[QStringLiteral("category")] = cl.category;
//INFO_LOG() << "toJsonDocument: id: " << cl.id << ", line: " << cl.line << ", amount: " << cl.amount << ", category: " << cl.category;
//INFO_LOG(m_logger) << "toJsonDocument: id: " << cl.id << ", line: " << cl.line << ", amount: " << cl.amount << ", category: " << cl.category;
arr.append(obj);
}
@@ -19,6 +19,8 @@ namespace Evaluations
static QJsonDocument toJson(std::vector<Database::SanCategoryLine> vecCategoryLines);
private:
NGL::INGLLogger &m_logger;
};
}