replaced supplement RList calls with Btree.Extract

LSL2/STPROC/NDW_ADD_SUPPLEMENT_EVENTS.txt

@@ -38,7 +38,7 @@ $insert APP_INSERTS
 $insert EVENT_SETUP
 $insert MSG_EQUATES
 $Insert SUPPLEMENTS_EQUATES
- 
+
 Declare subroutine  SRP_Show_Window, Supplement_Services
 Declare function SRP_Array, Supplement_Services
 
@@ -49,15 +49,15 @@ Subclass        = SubclassInfo<1>
 
 // Update the arguments so that the OpenInsight OLE event will treate the ActiveX event as a native event handler.
 If Event EQ 'OLE' then
-    Transfer Event to OIEvent
-    Transfer Param1 to Event
-    Transfer Param2 to Param1
-    Transfer Param3 to Param2
-*    Transfer Param4 to Param3
-*    Transfer Param5 to Param4
-*    Transfer Param6 to Param5
-*    Transfer Param7 to Param6
-*    Transfer Param8 to Param7
+	Transfer Event to OIEvent
+	Transfer Param1 to Event
+	Transfer Param2 to Param1
+	Transfer Param3 to Param2
+    Transfer Param4 to Param3
+    Transfer Param5 to Param4
+    Transfer Param6 to Param5
+    Transfer Param7 to Param6
+    Transfer Param8 to Param7
 end
 
 GoToEvent Event for CtrlEntID
@@ -70,69 +70,71 @@ Return EventFlow else EVENT_CONTINUE$
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 Event WINDOW.CREATE(CreateParam)
-
-    Result      = ''
-    SupplInst   = ''
-    GoSub Setup_OLE_Controls
-    If CreateParam NE '' then
-        Gosub PopulateStages
-        Set_Property(@Window : '.CMB_STAGE', 'LIST', StageList)
-        Set_Property(@Window : '.CMB_STAGE', 'SELPOS', 1)
-        Set_Property(@Window : '.PUB_OK', 'ENABLED', True$)
-    end    
-    
-    Gosub CheckForSupplements
-    SRP_Show_Window(@Window, '', 'C', 'C', 1, '', False$, False$, FormSize)
-
+	
+	Result      = ''
+	SupplInst   = ''
+	GoSub Setup_OLE_Controls
+	If CreateParam NE '' then
+		Gosub PopulateStages
+		Set_Property(@Window : '.CMB_STAGE', 'LIST', StageList)
+		Set_Property(@Window : '.CMB_STAGE', 'SELPOS', 1)
+		Set_Property(@Window : '.PUB_OK', 'ENABLED', True$)
+	end    
+	
+	Gosub CheckForSupplements
+	SRP_Show_Window(@Window, '', 'C', 'C', 1, '', False$, False$, FormSize)
+	
 end event
 
 
 Event WINDOW.CLOSE(CancelFlag)
-    
-    Result      = ''
-    Result<1>   = False$
-    End_Dialog(@Window, Result)
-    
+	
+	Result      = ''
+	Result<1>   = False$
+	End_Dialog(@Window, Result)
+	
 end event
 
+
 Event CMB_STAGE.CHANGED(CreateParam)
 	
 	Gosub CheckForSupplements
 	
 end event
 
+
 Event EDL_SUPPL_INST.CHAR(VirtCode, ScanCode, CtrlKey, ShiftKey, AltKey)
-
-    SupplInst    = Get_Property(CtrlEntId, 'TEXT')
-    If SupplInst NE '' then
-        Set_Property(@Window : '.PUB_OK', 'ENABLED', True$)
-    end else
-        Set_Property(@Window : '.PUB_OK', 'ENABLED', False$)
-    end
-
+	
+	SupplInst    = Get_Property(CtrlEntId, 'TEXT')
+	If SupplInst NE '' then
+		Set_Property(@Window : '.PUB_OK', 'ENABLED', True$)
+	end else
+		Set_Property(@Window : '.PUB_OK', 'ENABLED', False$)
+	end
+	
 end event
 
 
 Event PUB_OK.CLICK()
 	
-    Result      = ''
-    SupplInst   = Get_Property(@Window : '.EDL_SUPPL_INST', 'TEXT')
-    StageSel    = Get_Property(@Window : '.CMB_STAGE', 'TEXT')
-    StageReturn = Field(StageSel, '-', 2)
-    
-    Result<1> = True$
-    Result<2> = StageReturn :': ': SupplInst
-    End_Dialog(@Window, Result)
-    
+	Result      = ''
+	SupplInst   = Get_Property(@Window : '.EDL_SUPPL_INST', 'TEXT')
+	StageSel    = Get_Property(@Window : '.CMB_STAGE', 'TEXT')
+	StageReturn = Field(StageSel, '-', 2)
+	
+	Result<1> = True$
+	Result<2> = StageReturn :': ': SupplInst
+	End_Dialog(@Window, Result)
+	
 end event
 
 
 Event PUB_CANCEL.CLICK()
-
-    Result      = ''
-    Result<1>   = False$
-    End_Dialog(@Window, Result)
-
+	
+	Result      = ''
+	Result<1>   = False$
+	End_Dialog(@Window, Result)
+	
 end event
 
 
@@ -141,11 +143,11 @@ end event
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 Setup_OLE_Controls:
-
-    Qualify     = ''
-    Qualify<1>  = 1
-    Qualify<4>  = 0
-
+	
+	Qualify     = ''
+	Qualify<1>  = 1
+	Qualify<4>  = 0
+	
 return
 
 PopulateStages:
@@ -154,8 +156,7 @@ PopulateStages:
 	PlainTextStages = ''
 	RDSList         = SRP_Array("Rotate", CreateParam)
 	@ReCur1         = RDSList<5>
-	@ReCur2         = RDSList<15>
-	
+	@ReCur2         = RDSList<15>	
 	For Each RDSKey in @ReCur1 Using @VM
 		RDSStageList      = Supplement_Services('GetStagesForLot', 'RDS', RDSKey)
 		RDSStageList2     = RDSStageList<2> :@FM: RDSStageList<1>
@@ -168,14 +169,16 @@ PopulateStages:
 	Next RDSKey
 	Swap @VM with ' -' in DraftStageList
 	StageList          = SRP_Array('Clean', DraftStageList, "TrimAndMakeUnique", @FM)
+	
 return
 
+
 CheckForSupplements:
 	
-	 SuppFound = False$
-	 SuppText  = ''
-	 StageSel  = Get_Property(@Window : '.CMB_STAGE', 'TEXT')
-     Stage     = Field(StageSel, '-', 2)
+	SuppFound = False$
+	SuppText  = ''
+	StageSel  = Get_Property(@Window : '.CMB_STAGE', 'TEXT')
+	Stage     = Field(StageSel, '-', 2)
 	For Each RDSKey in @ReCur1 Using @VM Setting Pos
 		If @Recur2<pos> NE '' then
 			Supps = @Recur2<pos>
@@ -186,7 +189,7 @@ CheckForSupplements:
 					SuppText  = TrimF(SuppText)
 					SuppFound = True$
 				end
-				Until SuppFound NE False$
+			Until SuppFound NE False$
 			Next Supp
 			If SuppText EQ '' then SuppFound = Supplement_Services('GetSupplementsForLot', 'RDS', RDSKey, Stage)
 		end else
@@ -209,11 +212,6 @@ CheckForSupplements:
 		Set_Property(@Window : '.EDL_SUPPL_INST', 'TEXT', '')
 		Set_Property(@Window : '.PUB_OK', 'ENABLED', False$)
 	end
-
+	
 return
 
-
-
-
-
-