From 73d02d214a4a78a3f3435192b7933edd1ae91bca Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 17 Jan 2024 15:26:53 +0100 Subject: [PATCH] Send contant of m_versionInfo(0) (git commit of repository) to ISMAS. --- worker.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/worker.h b/worker.h index 5702c8b..ba13ece 100644 --- a/worker.h +++ b/worker.h @@ -688,7 +688,7 @@ private: QString("CLONED REPOSITORY %1 AND CHECKED OUT BRANCH %2") .arg(instance->m_customerRepository) .arg(instance->m_gc.branchName()).toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -704,7 +704,7 @@ private: QString("CLONING REPOSITORY %1 OR CHECKING OUT BRANCH %2 FAILED") .arg(instance->m_customerRepository) .arg(instance->m_gc.branchName()).toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -718,7 +718,8 @@ private: ismasClient.cloneAndCheckoutCustomerRepository( QString("CHECKED OUT REPOSITORY %1 AND CHECKED OUT BRANCH %2") .arg(instance->m_customerRepository) - .arg(instance->m_gc.branchName()))); + .arg(instance->m_gc.branchName()), + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A")); break; case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE: ismasClient.setProgressInPercent(_CHECKOUT_REPOSITORY_FAILURE); @@ -730,7 +731,8 @@ private: ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_SUCCESS); ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT, QString("#M=APISM#C=CMD_EVENT#J=") + - ismasClient.updateTriggerSet("ISMAS TRIGGER SET", "")); + ismasClient.updateTriggerSet("ISMAS TRIGGER SET", + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A")); break; case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE: ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_WRONG_VALUE); @@ -745,7 +747,7 @@ private: IsmasClient::RESULT_CODE::INSTALL_ERROR, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -768,7 +770,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -782,7 +784,7 @@ private: IsmasClient::RESULT_CODE::INSTALL_ERROR, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -916,7 +918,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -933,7 +935,7 @@ private: IsmasClient::RESULT_CODE::INSTALL_ERROR, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -959,7 +961,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -976,7 +978,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -996,7 +998,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -1016,7 +1018,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -1039,7 +1041,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -1053,7 +1055,7 @@ private: IsmasClient::RESULT_CODE::SUCCESS, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; @@ -1067,7 +1069,7 @@ private: IsmasClient::RESULT_CODE::INSTALL_ERROR, smap[step], instance->m_ismasMsg.join(' ').toStdString().c_str(), - ""); + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break;