From ea1a6b8f5c54d220c43d84dae61dd208ff5e1f64 Mon Sep 17 00:00:00 2001 From: peterbarancek <62284244+peterbarancek@users.noreply.github.com> Date: Fri, 12 Jun 2026 10:44:58 +0200 Subject: [PATCH] accumulation results in groups --- .../TcoInspectionGroup.TcPOU | 26 +++++++------------ .../POUs/TcoInspector/TcoInspector.TcPOU | 20 +++++++------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU index ce4c2eb1..ae5ac38a 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU @@ -540,24 +540,18 @@ CASE _currentRunResult.Result OF eOverallResult.Passed: ; eOverallResult.Failed: - _refOverallResult:=_originalOverallResult; + _refOverallResult.Result := eOverallResult.Failed; - IF _refOverallResult.Failures<>'' THEN - _refOverallResult.Failures := concat(concat(_originalOverallResult.Failures,';'), _currentRunResult.Failures); - ELSE - _refOverallResult.Failures := _currentRunResult.Failures; - END_IF; - - IF _refOverallResult.ErrorCodes<>'' THEN - _refOverallResult.ErrorCodes := concat(concat(_originalOverallResult.ErrorCodes,';'),_currentRunResult.ErrorCodes); - ELSE - _refOverallResult.ErrorCodes := _currentRunResult.ErrorCodes; - END_IF; + _refOverallResult.Failures := _currentRunResult.Failures; + _refOverallResult.ErrorCodes := _currentRunResult.ErrorCodes; END_CASE IF(_done) THEN + _refOverallResult.Failures :=concat( _originalOverallResult.Failures,_refOverallResult.Failures); + _refOverallResult.ErrorCodes :=concat( _originalOverallResult.ErrorCodes,_refOverallResult.ErrorCodes); _overallResult := _refOverallResult; + END_IF; ]]> @@ -571,9 +565,7 @@ END_IF; ~*) METHOD PROTECTED UpdateDescriptions -VAR_INPUT - inOriginalResult:TcoComprehensiveResult;; -END_VAR + VAR_IN_OUT inoResult : TcoComprehensiveResult; END_VAR @@ -584,13 +576,13 @@ END_VAR END_IF IF(_done AND NOT _done_PV) THEN inoResult.Failures := THIS^.Context.Environment.Messaging.StringBuilder.Clear() - .Append(inOriginalResult.Failures) + .Append(inoResult.Failures) .Append(CommonData.FailureDescription) .Append(';') .ToString(); inoResult.ErrorCodes := THIS^.Context.Environment.Messaging.StringBuilder.Clear() - .Append(inOriginalResult.ErrorCodes) + .Append(inoResult.ErrorCodes) .Append(CommonData.ErrorCode) .Append(';') .ToString(); diff --git a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU index 4554b002..e8fcae17 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU @@ -652,18 +652,20 @@ CASE _inspectorTask.InspectionData.Result OF eInspectorResult.Passed: ; eInspectorResult.Failed: - _refOverallResult:=_originalOverallResult; _refOverallResult.Result := eOverallResult.Failed; - UpdateDescriptions(_originalOverallResult,inoResult); + UpdateDescriptions(inoResult); eInspectorResult.Inconclusive: - _refOverallResult:=_originalOverallResult; _refOverallResult.Result := eOverallResult.Failed; - UpdateDescriptions(_originalOverallResult,inoResult); + UpdateDescriptions(inoResult); eInspectorResult.Excluded: ; eInspectorResult.Bypassed: ; -END_CASE]]> +END_CASE + + + +]]> @@ -675,9 +677,7 @@ END_CASE]]> ~*) METHOD PROTECTED UpdateDescriptions -VAR_INPUT - inOriginalResult:TcoComprehensiveResult;; -END_VAR + VAR_IN_OUT inoResult : TcoComprehensiveResult; END_VAR @@ -685,13 +685,13 @@ END_VAR