Trim spec values with whitespece

This commit is contained in:
Chase Tucker
2025-10-01 14:21:57 -07:00
committed by Tucker Chase (CSC FI SPS MESLEO)
parent 128bf2ef8d
commit acd7949e85

View File

@ -39,7 +39,7 @@ $Insert PRS_PROP_EQUATES
Options SpecTypes = 'CLEAN', 'SURFSCAN', 'THICK', 'THICKA', 'RES', 'SRES', 'CRES', 'CONC' Options SpecTypes = 'CLEAN', 'SURFSCAN', 'THICK', 'THICKA', 'RES', 'SRES', 'CRES', 'CONC'
Declare function Database_Services, Psn_Services, obj_Prod_Spec, Error_Services, SRP_JSON, Cust_Epi_Part_Services Declare function Database_Services, Psn_Services, obj_Prod_Spec, Error_Services, SRP_JSON, Cust_Epi_Part_Services
Declare function Prod_Ver_Services, PRS_Stage_Services, SRP_Array, Tool_Class_Services Declare function Prod_Ver_Services, PRS_Stage_Services, SRP_Array, Tool_Class_Services, SRP_String
Declare subroutine Database_Services, Psn_Services, Error_Services, SRP_JSON, Extract_Si_Keys Declare subroutine Database_Services, Psn_Services, Error_Services, SRP_JSON, Extract_Si_Keys
GoToService else GoToService else
@ -116,8 +116,11 @@ Service GetMetrologyRecipesAndPatterns(PSNo)
Extract_Si_Keys('PRS_PROP', 'PS_NO', PSNo, PropKeys) Extract_Si_Keys('PRS_PROP', 'PS_NO', PSNo, PropKeys)
for each PropKey in PropKeys using @VM setting pPos for each PropKey in PropKeys using @VM setting pPos
Recipe = Xlate('PRS_PROP', PropKey, PRS_PROP_RECIPE$, 'X') Recipe = Xlate('PRS_PROP', PropKey, PRS_PROP_RECIPE$, 'X')
Recipe = SRP_String('Trim', Recipe, FB)
Pattern = Xlate('PRS_PROP', PropKey, PRS_PROP_PATTERN$, 'X') Pattern = Xlate('PRS_PROP', PropKey, PRS_PROP_PATTERN$, 'X')
Pattern = SRP_String('Trim', Pattern, FB)
Tool = Xlate('PRS_PROP', PropKey, PRS_PROP_TOOL$, 'X') Tool = Xlate('PRS_PROP', PropKey, PRS_PROP_TOOL$, 'X')
Tool = SRP_String('Trim', Tool, FB)
Convert @LOWER_CASE to @UPPER_CASE in Tool Convert @LOWER_CASE to @UPPER_CASE in Tool
If Recipe NE '' and Pattern NE '' and Tool NE '' then If Recipe NE '' and Pattern NE '' and Tool NE '' then
@ -136,8 +139,11 @@ Service GetMetrologyRecipesAndPatterns(PSNo)
for each PRSStageKey in PRSStageKeys using @VM setting sPos for each PRSStageKey in PRSStageKeys using @VM setting sPos
Recipes = Xlate('PRS_STAGE', PRSStageKey, PRS_STAGE_MET_RECIPE$, 'X') Recipes = Xlate('PRS_STAGE', PRSStageKey, PRS_STAGE_MET_RECIPE$, 'X')
for each Recipe in Recipes using @VM setting rPos for each Recipe in Recipes using @VM setting rPos
Recipe = SRP_String('Trim', Recipe, FB)
Pattern = Xlate('PRS_STAGE', PRSStageKey, PRS_STAGE_MET_RECIPE_PATTERN$, 'X')<1, rPos> Pattern = Xlate('PRS_STAGE', PRSStageKey, PRS_STAGE_MET_RECIPE_PATTERN$, 'X')<1, rPos>
Pattern = SRP_String('Trim', Pattern, FB)
Tool = Xlate('PRS_STAGE', PRSStageKey, PRS_STAGE_MET_TOOL_CLASS$, 'X')<1, rPos> Tool = Xlate('PRS_STAGE', PRSStageKey, PRS_STAGE_MET_TOOL_CLASS$, 'X')<1, rPos>
Tool = SRP_String('Trim', Tool, FB)
Convert @LOWER_CASE to @UPPER_CASE in Tool Convert @LOWER_CASE to @UPPER_CASE in Tool
If Recipe NE '' and Tool NE '' and Pattern NE '' then If Recipe NE '' and Tool NE '' and Pattern NE '' then