From 63d9fe7964369775a097e92708f5f0566131c412 Mon Sep 17 00:00:00 2001 From: "Infineon\\Mitchem" Date: Mon, 25 Aug 2025 12:41:20 -0700 Subject: [PATCH] Replace DATABASE_SERVICES with current prod version. --- LSL2/STPROC/DATABASE_SERVICES.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/LSL2/STPROC/DATABASE_SERVICES.txt b/LSL2/STPROC/DATABASE_SERVICES.txt index 646980a..6b226eb 100644 --- a/LSL2/STPROC/DATABASE_SERVICES.txt +++ b/LSL2/STPROC/DATABASE_SERVICES.txt @@ -527,7 +527,7 @@ end service // Reads a data column for the indicated Key ID and database table. //---------------------------------------------------------------------------------------------------------------------- Service ReadDataColumn(TableName, KeyID, ColumnNo, NotExpired, ExpirationDuration, IgnoreMFSRoutines) - + If NotExpired NE False$ then NotExpired = True$ If (ExpirationDuration EQ '') OR (Not(Num(ExpirationDuration))) then ExpirationDuration = 0 If IgnoreMFSRoutines NE True$ then IgnoreMFSRoutines = False$ @@ -609,7 +609,6 @@ Service ReadDataRow(TableName, KeyID, NotExpired, ExpirationDuration, IgnoreMFSR Memory_Services('SetValue', ServiceKeyID, DataRow) end else Error_Services('Add', 'Error reading ' : KeyID : ' from the ' : TableName : ' table in the ' : Service : ' service. Error = ' : @File_Error<1>) - end end end @@ -1009,12 +1008,17 @@ Service WriteDataColumn(TableName, KeyID, ColumnNo, Value, IgnoreSelfLock, Ignor Error_Services('Add', ErrorMsg) end end -* end + If IgnoreAllLocks EQ False$ then + Database_Services('ReleaseKeyIDLock', TableName, KeyID) + end + end else + Error_Services('Add', 'Unable to lock ' : KeyID : ' for the ' : TableName : ' table in the ' : Service : ' service.') + end end else - Error_Services('Add', 'Unable to lock ' : KeyID : ' for the ' : TableName : ' table in the ' : Service : ' service.') + Error_Services('Add', 'ColumnNo was not a number or was not greater than zero in the ' :Service : ' service.') end end else - Error_Services('Add', 'TableName or KeyID argument was missing in the ' : Service : ' service.') + Error_Services('Add', 'TableName, KeyID, or ColumnNo argument was missing in the ' : Service : ' service.') end end service