From 95763eb69b24f6ef2976b0e92a1a0ed00e4d4b57 Mon Sep 17 00:00:00 2001 From: "Infineon\\Ouellette" Date: Mon, 9 Dec 2024 10:55:02 -0700 Subject: [PATCH] Changed from Xlate to Database_Services due to XLATE caching values --- LSL2/STPROC/SCAN_SERVICES.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/LSL2/STPROC/SCAN_SERVICES.txt b/LSL2/STPROC/SCAN_SERVICES.txt index f8ad61d..89259ad 100644 --- a/LSL2/STPROC/SCAN_SERVICES.txt +++ b/LSL2/STPROC/SCAN_SERVICES.txt @@ -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 = 'P' + ReactorRec = Database_Services('ReadDataRow', 'REACTOR', Reactor, True$, 0, False$) + ReactorRec = 'P' rotrStatusReason = ReactorRec ReactorRec = 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 = 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 = True$ @@ -2233,4 +2233,3 @@ ClearCursors: Next counter return -