From 853787cd4b334d7da26532f653f4dc57c410caac Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 11 Aug 2023 11:09:51 +0200 Subject: [PATCH] Added lastCommit to tariff-struct. Added jsonParseFailed(). --- ismas/ismas_client.cpp | 14 ++++++++++++-- ismas/ismas_client.h | 4 +++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ismas/ismas_client.cpp b/ismas/ismas_client.cpp index 2a8b19a..d563e75 100644 --- a/ismas/ismas_client.cpp +++ b/ismas/ismas_client.cpp @@ -753,11 +753,21 @@ QString IsmasClient::sanityCheckFailed(int resultCode, QString reason, QString c version.toStdString().c_str()); } -QString IsmasClient::updateOfPSAFailed(int resultCode, QString reason, QString const &version) { +QString IsmasClient::jsonParseFailed(int resultCode, QString reason, QString const &version) { return updateNewsToIsmas("U0003", m_progressInPercent, resultCode, - "UPDATE ERROR", + "JSON-PARSE-ERROR", + reason.toStdString().c_str(), + version.toStdString().c_str()); +} + +QString IsmasClient::updateOfPSAFailed(int resultCode, QString step, + QString reason, QString const &version) { + return updateNewsToIsmas("U0003", + m_progressInPercent, + resultCode, + step.toStdString().c_str(), reason.toStdString().c_str(), version.toStdString().c_str()); } diff --git a/ismas/ismas_client.h b/ismas/ismas_client.h index 9274e8c..be5407a 100644 --- a/ismas/ismas_client.h +++ b/ismas/ismas_client.h @@ -12,6 +12,7 @@ struct PSAInstalled { int zone; int size; QString blob; + QString lastCommit; QString info; QString loadTime; } tariff; @@ -155,8 +156,9 @@ public: // and update accepted QString updateOfPSASucceeded(QString const &version = QString()); // update process succeeded QString updateOfPSAContinues(QString currentStage, QString currentStageInfo, QString const &version = QString()); - QString updateOfPSAFailed(int resultCode, QString reason, QString const &version = QString()); + QString updateOfPSAFailed(int resultCode, QString step, QString reason, QString const &version = QString()); QString sanityCheckFailed(int resultCode, QString reason, QString const &version = QString()); + QString jsonParseFailed(int resultCode, QString reason, QString const &version = QString()); QString updateOfPSASendVersion(PSAInstalled const &psa);