Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

B2022-023 added logic to process <U-Other > tokens that have a space after “Other”

Browse Source
This commit is contained in:
John Jenko
2022-02-09 13:53:43 +00:00
parent ba7f0faea8
commit 9098c58ea8
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
View File

@@ -310,10 +310,11 @@ namespace VEPROMS.CSLA.Library
else if (val.ToUpper() == "<U-NAME>") val = MyDocVersionInfo.DocVersionConfig.Unit_Name;
else if (val.ToUpper() == "<U-ID>") val = MyDocVersionInfo.DocVersionConfig.Unit_ID;
// B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the <20>OTHER<45> tokens
else if (val.ToUpper() == "<U-OTHERTEXT>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
else if (val.ToUpper() == "<U-OTHERNUMBER>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
else if (val.ToUpper() == "<U-OTHERNAME>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;
else if (val.ToUpper() == "<U-OTHERID>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_ID;
// B2022-023 also check for other followed by a space
else if (val.ToUpper() == "<U-OTHERTEXT>" || val.ToUpper() == "<U-OTHER TEXT>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Text;
else if (val.ToUpper() == "<U-OTHERNUMBER>" || val.ToUpper() == "<U-OTHER NUMBER>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Number;
else if (val.ToUpper() == "<U-OTHERNAME>" || val.ToUpper() == "<U-OTHER NAME>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_Name;
else if (val.ToUpper() == "<U-OTHERID>" || val.ToUpper() == "<U-OTHER ID>") val = MyDocVersionInfo.DocVersionConfig.Other_Unit_ID;
}
return val;
}
@@ -328,7 +329,7 @@ namespace VEPROMS.CSLA.Library
//string childName = MyDocVersionInfo.DocVersionConfig.Unit_Name;
MatchCollection mm = Regex.Matches(roval, "(<APL [^<]+) /APL>"); // B2022-020 remove a un-needed question mark that was in the search criteria
if (mm.Count == 0) // B2022-020 will now write in error log if there is a problem
_MyLog.WarnFormat("Parent/Child Values not parable for <APL ... /APL>\r\nItemId={0}\r\nROValue={1} ",MyDocVersionInfo.ItemID,roval);
_MyLog.WarnFormat("Parent/Child Values not parsable for <APL ... /APL>\r\nItemId={0}\r\nROValue={1} ",MyDocVersionInfo.ItemID,roval);
StringBuilder sb = new StringBuilder();
int lastIndex = 0;
// Get selected child Idx