Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+10
-10
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user