Changed from Xlate to Database_Services due to XLATE caching values

This commit is contained in:
Infineon\Ouellette 2024-12-09 10:55:02 -07:00
parent 432db10957
commit 95763eb69b

View File

@ -498,8 +498,8 @@ Service ProcessScanData(ScanID, ScanJSON)
RDSRec = Insert(RDSRec, RDS_OVERRIDE_KEYS$, 1, 0, orKey)
//Clear Set ROTR status to Passing and clear reason
ReactorRec = XLATE('REACTOR', Reactor, '', 'X')
ReactorRec<REACTOR_ROTR_STATUS$> = 'P'
ReactorRec = Database_Services('ReadDataRow', 'REACTOR', Reactor, True$, 0, False$)
ReactorRec<REACTOR_ROTR_STATUS$> = 'P'
rotrStatusReason = ReactorRec<REACTOR_ROTR_STATUS_REASON$>
ReactorRec<REACTOR_PREVIOUS_ROTR_STATUS_REASON$> = rotrStatusReason
@ -909,9 +909,9 @@ Service ProcessScanData(ScanID, ScanJSON)
Error_Services('Clear')
Scan_Services('AddNotAcceptableReason', ErrorMsg)
Case IndexC(ErrorMsg, 'ROTR', 1)
ROTRBlock = Xlate('REACTOR', Reactor, REACTOR_ROTR_STATUS$, 'X')
ROTRBlockReason = Xlate('REACTOR', Reactor, REACTOR_ROTR_STATUS_REASON$, 'X')
ROTREnabled = Xlate('REACTOR', Reactor, REACTOR_ENABLE_ROTR$, 'X')
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$)
If ( (ROTRBlock NE 'P') AND (ROTREnabled EQ True$) ) then
// Clear the error to return a JSON payload and allow for OVERRIDE scan.
ScansRow<SCANS.OVERRIDE_REQD$> = True$
@ -980,9 +980,9 @@ Service ProcessScanData(ScanID, ScanJSON)
Error_Services('Clear')
Scan_Services('AddNotAcceptableReason', ErrorMsg)
Case IndexC(ErrorMsg, 'ROTR', 1)
ROTRBlock = Xlate('REACTOR', Reactor, REACTOR_ROTR_STATUS$, 'X')
ROTRBlockReason = Xlate('REACTOR', Reactor, REACTOR_ROTR_STATUS_REASON$, 'X')
ROTREnabled = Xlate('REACTOR', Reactor, REACTOR_ENABLE_ROTR$, 'X')
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$)
If ( (ROTRBlock NE 'P') AND (ROTREnabled EQ True$) ) then
// Clear the error to return a JSON payload and allow for OVERRIDE scan.
ScansRow<SCANS.OVERRIDE_REQD$> = True$
@ -2233,4 +2233,3 @@ ClearCursors:
Next counter
return