From f1a719d2793fc21ea3d2119a12f79cee393e97c8 Mon Sep 17 00:00:00 2001 From: "Ouellette Jonathan (CSC FI SPS MESLEO)" Date: Wed, 24 Sep 2025 15:57:32 +0000 Subject: [PATCH] Merged PR 26784: Error Message buffer variable mismatch. Errors were being set to ErrorMsg and... Error Message buffer variable mismatch. Errors were being set to ErrorMsg and it needed to be set to ErrMsg. LoadSignatureReady was being set to false, but there were no cases to handle that false response with the variable ErrMsg not getting set. --- LSL2/STPROC/SCAN_SERVICES.txt | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/LSL2/STPROC/SCAN_SERVICES.txt b/LSL2/STPROC/SCAN_SERVICES.txt index dcff130..9b26817 100644 --- a/LSL2/STPROC/SCAN_SERVICES.txt +++ b/LSL2/STPROC/SCAN_SERVICES.txt @@ -1003,13 +1003,13 @@ Service ProcessScanData(ScanID, ScanJSON) LoadStageReady = QA_Services('LoadSignatureReady', RDSNo, Username, WaferQty, LLSide, True$, Reactor) If (LoadStageReady NE True$) then // Why is it not ready? - ErrorMsg = Error_Services('GetMessage') + ErrMsg = Error_Services('GetMessage') Begin Case - Case IndexC(ErrorMsg, 'supplement', 1) + Case IndexC(ErrMsg, 'supplement', 1) // Clear the error to return a JSON payload and handle the acknowledgements. Error_Services('Clear') - Scan_Services('AddNotAcceptableReason', ErrorMsg) - Case IndexC(ErrorMsg, 'ROTR', 1) + Scan_Services('AddNotAcceptableReason', ErrMsg) + Case IndexC(ErrMsg, 'ROTR', 1) ROTRBlock = Database_Services('ReadDataColumn', 'REACTOR', Reactor, REACTOR_ROTR_STATUS$, True$, 0, False$) ROTRBlockReason = Database_Services('ReadDataColumn', 'REACTOR', Reactor, REACTOR_ROTR_STATUS_REASON$, True$, 0, False$) ROTREnabled = Database_Services('ReadDataColumn', 'REACTOR', Reactor, REACTOR_ENABLE_ROTR$, True$, 0, False$) @@ -1029,11 +1029,11 @@ Service ProcessScanData(ScanID, ScanJSON) end end else // Why is it not ready? - ErrorMsg = Error_Services('GetMessage') + ErrMsg = Error_Services('GetMessage') Begin Case - Case IndexC(ErrorMsg, 'supplement', 1) + Case IndexC(ErrMsg, 'supplement', 1) Error_Services('Clear') - Scan_Services('AddNotAcceptableReason', ErrorMsg) + Scan_Services('AddNotAcceptableReason', ErrMsg) End Case end end else @@ -1079,13 +1079,13 @@ Service ProcessScanData(ScanID, ScanJSON) LoadStageReady = QA_Services('LoadSignatureReady', RDSNo, Username, WaferQty, LLSide) If (LoadStageReady NE True$) then // Why is it not ready? - ErrorMsg = Error_Services('GetMessage') + ErrMsg = Error_Services('GetMessage') Begin Case - Case IndexC(ErrorMsg, 'supplement', 1) + Case IndexC(ErrMsg, 'supplement', 1) // Clear the error to return a JSON payload and handle the acknowledgements. Error_Services('Clear') - Scan_Services('AddNotAcceptableReason', ErrorMsg) - Case IndexC(ErrorMsg, 'ROTR', 1) + Scan_Services('AddNotAcceptableReason', ErrMsg) + Case IndexC(ErrMsg, 'ROTR', 1) ROTRBlock = Database_Services('ReadDataColumn', 'REACTOR', Reactor, REACTOR_ROTR_STATUS$, True$, 0, False$) ROTRBlockReason = Database_Services('ReadDataColumn', 'REACTOR', Reactor, REACTOR_ROTR_STATUS_REASON$, True$, 0, False$) ROTREnabled = Database_Services('ReadDataColumn', 'REACTOR', Reactor, REACTOR_ENABLE_ROTR$, True$, 0, False$) @@ -1110,8 +1110,8 @@ Service ProcessScanData(ScanID, ScanJSON) Scan_Services('AddNotAcceptableReason', 'The LWI stage engineering instructions must be acknowledged before the load operation can be signed.') end end else - ErrorMessage = 'RDS layer parameters must be reviewed for accuracy and acknowledged before the load operation can be signed.' - Scan_Services('AddNotAcceptableReason', ErrorMessage) + ErrMsg = 'RDS layer parameters must be reviewed for accuracy and acknowledged before the load operation can be signed.' + Scan_Services('AddNotAcceptableReason', ErrMsg) end end else ErrMsg = 'Scanned tool ':ScanTool:' does not match the scheduled tool ':SchedTool:'. (':RDSNo:')' @@ -1138,11 +1138,11 @@ Service ProcessScanData(ScanID, ScanJSON) UnloadStageReady = QA_Services('UnloadSignatureReady', RDSNo, Username, Reactor) If Not(UnloadStageReady) then // Why is it not ready? - ErrorMsg = Error_Services('GetMessage') + ErrMsg = Error_Services('GetMessage') Begin Case - Case IndexC(ErrorMsg, 'supplement', 1) + Case IndexC(ErrMsg, 'supplement', 1) Error_Services('Clear') - Scan_Services('AddNotAcceptableReason', ErrorMsg) + Scan_Services('AddNotAcceptableReason', ErrMsg) Case Otherwise$ // Keep error on Error_Services stack and return 400 level error. End Case @@ -2421,3 +2421,4 @@ return +