diff --git a/LSL2/STPROC/REACTOR_SERVICES.txt b/LSL2/STPROC/REACTOR_SERVICES.txt index 6ab26cb..c7b6be2 100644 --- a/LSL2/STPROC/REACTOR_SERVICES.txt +++ b/LSL2/STPROC/REACTOR_SERVICES.txt @@ -2775,12 +2775,21 @@ Service ConvertRecordToJSON(ReactorNo, ItemURL, CurrUser, FullObject=BOOLEAN) SRP_JSON(objReactor, 'SetValue', 'ArmsCnt', Xlate('REACTOR', ReactorNo, REACTOR_ARMS_WFR_CNT$, 'X')) // Add Current Run Status (Current Loaded Cassettes) - LoadedRDS = Xlate('REACT_STATUS', ReactorNo, 'LOAD_RDS', 'X') + LoadLockLeftRDS = '' + LoadLockRightRDS = '' + LoadedRDS = Xlate('REACT_STATUS', ReactorNo, 'LOAD_RDS', 'X') If LoadedRDS NE '' then objLoadedRDS = '' If SRP_JSON(objLoadedRDS, 'New', 'Array') then For each RDS in LoadedRDS using @VM setting vPos SRP_JSON(objLoadedRDS, 'AddValue', RDS) + LoadLockSide = Xlate('RDS', RDS, 'LOAD_LOCK_SIDE', 'X') + Begin Case + Case LoadLockSide EQ 'L' + LoadLockLeftRDS = RDS + Case LoadLockSide EQ 'R' + LoadLockRightRDS = RDS + End Case Next RDS SRP_JSON(objReactor, 'Set', 'loadedRDS', objLoadedRDS) SRP_JSON(objLoadedRDS, 'Release') @@ -2788,6 +2797,8 @@ Service ConvertRecordToJSON(ReactorNo, ItemURL, CurrUser, FullObject=BOOLEAN) end else SRP_JSON(objReactor, 'SetValue', 'loadedRDS', '') end + SRP_JSON(objReactor, 'SetValue', 'loadLockLeftRDS', LoadLockLeftRDS) + SRP_JSON(objReactor, 'SetValue', 'loadLockRightRDS', LoadLockRightRDS) // Add new reactor items here InstItems = Xlate('REACTOR', ReactorNo, REACTOR_CURR_INST_ITEMS$, 'X') @@ -4420,4 +4431,3 @@ ClearCursors: return -