diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index d049471f..4ede338e 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1818,6 +1818,8 @@ i = 0; case "[EOPNUM]": case "{PREDELIMEOPNUM}": case "[PREDELIMEOPNUM]": + case "{EOPNUMROLU}": + case "[EOPNUMROLU]": string eopnum = section.MyProcedure.MyContent.Number; string unitnum = MySection.MyDocVersion.DocVersionConfig.Unit_ProcedureNumber; string unitname = MySection.MyDocVersion.DocVersionConfig.Unit_Name; @@ -1829,10 +1831,32 @@ i = 0; eopnum = unitnum.Replace("!", unitname); if (eopnum == string.Empty) eopnum = section.MyProcedure.MyContent.Number; - // B2021-066: found and fixed during proc pc/pc work - if (eopnum.ToUpper().Contains(@", , , , , , , , + eopnum = Regex.Replace(eopnum, @"\", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)ID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)TEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHER ID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHER NAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHER TEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHER NUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + } + else + eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work + } + + } - if (token.Equals("{PREDELIMEOPNUM}")) + if (token.Equals("{ PREDELIMEOPNUM}")) { // only use up to the first non-alphanumeric character of the procedur number // Prairie Island (NSP) Alarms use this token