From b83a3fb57bdf5b15a7024f006a262636b546303d Mon Sep 17 00:00:00 2001
From: "Ouellette Jonathan (CSC FI SPS MESLEO)"
 <Jonathan.Ouellette@infineon.com>
Date: Wed, 24 Sep 2025 17:12:27 +0000
Subject: [PATCH] Merged PR 26794: Added increased error checking in
 CopyRDSLayerParameters service

Added increased error checking in CopyRDSLayerParameters service
---
 LSL2/STPROC/RDS_SERVICES.txt | 67 +++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/LSL2/STPROC/RDS_SERVICES.txt b/LSL2/STPROC/RDS_SERVICES.txt
index 5da6980..c59019f 100644
--- a/LSL2/STPROC/RDS_SERVICES.txt
+++ b/LSL2/STPROC/RDS_SERVICES.txt
@@ -1157,37 +1157,47 @@ Service CopyRDSLayerParameters(RDSNo)
 			CopyRDSLayerKeys = Xlate('RDS', CopyRDSNo, 'RDS_LAYER_KEYS', 'X')
 			If CopyRDSLayerKeys NE '' then
 				For each CopyRDSLayerKey in CopyRDSLayerKeys
+				Until ErrMsg NE ''
 					// Copy RDS layer records
 					LayerID = Field(CopyRDSLayerKey, '*', 2)
 					DestRDSLayerKey = RDSNo:'*':LayerID
-					CopyRDSLayerRec = Database_Services('ReadDataRow', 'RDS_LAYER', CopyRDSLayerKey)                       
-					DestRDSLayerRec = Database_Services('ReadDataRow', 'RDS_LAYER', DestRDSLayerKey)
-					
-					DestRDSLayerRec<RDS_LAYER_DOPANT$>            = CopyRDSLayerRec<RDS_LAYER_DOPANT$>
-					DestRDSLayerRec<RDS_LAYER_EPI_DILUENT$>       = CopyRDSLayerRec<RDS_LAYER_EPI_DILUENT$>  
-					DestRDSLayerRec<RDS_LAYER_EPI_TIME$>          = CopyRDSLayerRec<RDS_LAYER_EPI_TIME$>
-					DestRDSLayerRec<RDS_LAYER_DILUENT_ADJ_PARAM$> = CopyRDSLayerRec<RDS_LAYER_DILUENT_ADJ_PARAM$>
-					DestRDSLayerRec<RDS_LAYER_DOPANT_FLOW$>       = CopyRDSLayerRec<RDS_LAYER_DOPANT_FLOW$>
-					DestRDSLayerRec<RDS_LAYER_HCL_FLOW$>          = CopyRDSLayerRec<RDS_LAYER_HCL_FLOW$> 
-					DestRDSLayerRec<RDS_LAYER_BAKE_TIME$>         = CopyRDSLayerRec<RDS_LAYER_BAKE_TIME$>
-					DestRDSLayerRec<RDS_LAYER_EPI_H2_FLOW$>       = CopyRDSLayerRec<RDS_LAYER_EPI_H2_FLOW$>
-					DestRDSLayerRec<RDS_LAYER_TCS_FLOW$>          = CopyRDSLayerRec<RDS_LAYER_TCS_FLOW$>
-					DestRDSLayerRec<RDS_LAYER_DCS_FLOW$>          = CopyRDSLayerRec<RDS_LAYER_DCS_FLOW$>
-					DestRDSLayerRec<RDS_LAYER_AUX1$>              = CopyRDSLayerRec<RDS_LAYER_AUX1$>
-					DestRDSLayerRec<RDS_LAYER_AUX2$>              = CopyRDSLayerRec<RDS_LAYER_AUX2$>
-					DestRDSLayerRec<RDS_LAYER_F_OFFSET$>          = CopyRDSLayerRec<RDS_LAYER_F_OFFSET$>
-					DestRDSLayerRec<RDS_LAYER_S_OFFSET$>          = CopyRDSLayerRec<RDS_LAYER_S_OFFSET$>
-					DestRDSLayerRec<RDS_LAYER_R_OFFSET$>          = CopyRDSLayerRec<RDS_LAYER_R_OFFSET$>
-					DestRDSLayerRec<RDS_LAYER_ETCH1$>             = CopyRDSLayerRec<RDS_LAYER_ETCH1$> 
-					DestRDSLayerRec<RDS_LAYER_ETCH2$>             = CopyRDSLayerRec<RDS_LAYER_ETCH2$> 
-					DestRDSLayerRec<RDS_LAYER_ETCH3$>             = CopyRDSLayerRec<RDS_LAYER_ETCH3$> 
-					DestRDSLayerRec<RDS_LAYER_OVERGROW_REQ$>      = CopyRDSLayerRec<RDS_LAYER_OVERGROW_REQ$> 
-					DestRDSLayerRec<RDS_LAYER_SUSC_ETCH$>         = CopyRDSLayerRec<RDS_LAYER_SUSC_ETCH$>
-					DestRDSLayerRec<RDS_LAYER_UL_TEMP$>           = CopyRDSLayerRec<RDS_LAYER_UL_TEMP$>                                  
-					DestRDSLayerRec<RDS_LAYER_MODIFY_USER$, -1>   = 'CopyService'
-					DestRDSLayerRec<RDS_LAYER_MODIFY_DTM$, -1>    = DateTime()
-					Database_Services('WriteDataRow', 'RDS_LAYER', DestRDSLayerKey, DestRDSLayerRec, True$, True$, True$)
-					
+					CopyRDSLayerRec = Database_Services('ReadDataRow', 'RDS_LAYER', CopyRDSLayerKey)
+					if Error_Services('NoError') then
+						DestRDSLayerRec = Database_Services('ReadDataRow', 'RDS_LAYER', DestRDSLayerKey)
+						If Error_Services('NoError') then
+							DestRDSLayerRec<RDS_LAYER_DOPANT$>            = CopyRDSLayerRec<RDS_LAYER_DOPANT$>
+							DestRDSLayerRec<RDS_LAYER_EPI_DILUENT$>       = CopyRDSLayerRec<RDS_LAYER_EPI_DILUENT$>  
+							DestRDSLayerRec<RDS_LAYER_EPI_TIME$>          = CopyRDSLayerRec<RDS_LAYER_EPI_TIME$>
+							DestRDSLayerRec<RDS_LAYER_DILUENT_ADJ_PARAM$> = CopyRDSLayerRec<RDS_LAYER_DILUENT_ADJ_PARAM$>
+							DestRDSLayerRec<RDS_LAYER_DOPANT_FLOW$>       = CopyRDSLayerRec<RDS_LAYER_DOPANT_FLOW$>
+							DestRDSLayerRec<RDS_LAYER_HCL_FLOW$>          = CopyRDSLayerRec<RDS_LAYER_HCL_FLOW$> 
+							DestRDSLayerRec<RDS_LAYER_BAKE_TIME$>         = CopyRDSLayerRec<RDS_LAYER_BAKE_TIME$>
+							DestRDSLayerRec<RDS_LAYER_EPI_H2_FLOW$>       = CopyRDSLayerRec<RDS_LAYER_EPI_H2_FLOW$>
+							DestRDSLayerRec<RDS_LAYER_TCS_FLOW$>          = CopyRDSLayerRec<RDS_LAYER_TCS_FLOW$>
+							DestRDSLayerRec<RDS_LAYER_DCS_FLOW$>          = CopyRDSLayerRec<RDS_LAYER_DCS_FLOW$>
+							DestRDSLayerRec<RDS_LAYER_AUX1$>              = CopyRDSLayerRec<RDS_LAYER_AUX1$>
+							DestRDSLayerRec<RDS_LAYER_AUX2$>              = CopyRDSLayerRec<RDS_LAYER_AUX2$>
+							DestRDSLayerRec<RDS_LAYER_F_OFFSET$>          = CopyRDSLayerRec<RDS_LAYER_F_OFFSET$>
+							DestRDSLayerRec<RDS_LAYER_S_OFFSET$>          = CopyRDSLayerRec<RDS_LAYER_S_OFFSET$>
+							DestRDSLayerRec<RDS_LAYER_R_OFFSET$>          = CopyRDSLayerRec<RDS_LAYER_R_OFFSET$>
+							DestRDSLayerRec<RDS_LAYER_ETCH1$>             = CopyRDSLayerRec<RDS_LAYER_ETCH1$> 
+							DestRDSLayerRec<RDS_LAYER_ETCH2$>             = CopyRDSLayerRec<RDS_LAYER_ETCH2$> 
+							DestRDSLayerRec<RDS_LAYER_ETCH3$>             = CopyRDSLayerRec<RDS_LAYER_ETCH3$> 
+							DestRDSLayerRec<RDS_LAYER_OVERGROW_REQ$>      = CopyRDSLayerRec<RDS_LAYER_OVERGROW_REQ$> 
+							DestRDSLayerRec<RDS_LAYER_SUSC_ETCH$>         = CopyRDSLayerRec<RDS_LAYER_SUSC_ETCH$>
+							DestRDSLayerRec<RDS_LAYER_UL_TEMP$>           = CopyRDSLayerRec<RDS_LAYER_UL_TEMP$>                                  
+							DestRDSLayerRec<RDS_LAYER_MODIFY_USER$, -1>   = 'CopyService'
+							DestRDSLayerRec<RDS_LAYER_MODIFY_DTM$, -1>    = DateTime()
+							Database_Services('WriteDataRow', 'RDS_LAYER', DestRDSLayerKey, DestRDSLayerRec, True$, True$, True$)
+							If Error_Services('HasError') then
+								ErrMsg = Error_Services('GetMessage')
+							end
+						end else
+							ErrMsg = Error_Services('GetMessage')
+						end
+					end else
+						ErrMsg = Error_Services('GetMessage')
+					end
 				Next CopyRDSLayerKey
 			end
 		end else
@@ -3381,3 +3391,4 @@ ClearCursors:
 return
 
 
+