From b1b30a71ba079fed7809f05a4946797832f122d1 Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Tue, 14 Dec 2021 19:54:55 +0000
Subject: [PATCH] =?UTF-8?q?B2021-148=20Needed=20to=20remove=20the=20space?=
 =?UTF-8?q?=20follow=20the=20=E2=80=9COTHER=E2=80=9D=20when=20processing?=
 =?UTF-8?q?=20applicability=20tokens?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs |  9 +++++----
 PROMS/Volian.Print.Library/VlnSvgPageHelper.cs      | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index cbc47b55..389e37ff 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -369,10 +369,11 @@ namespace VEPROMS.CSLA.Library
 				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase);
 				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase);
 				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NUMBER)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase);
-				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHER ID)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_ID, RegexOptions.IgnoreCase);
-				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHER NAME)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_Name, RegexOptions.IgnoreCase);
-				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHER TEXT)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_Text, RegexOptions.IgnoreCase);
-				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHER NUMBER)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_Number, RegexOptions.IgnoreCase);
+				//B2021-148 removed space character after OTHER
+				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHERID)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_ID, RegexOptions.IgnoreCase);
+				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHERNAME)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_Name, RegexOptions.IgnoreCase);
+				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHERTEXT)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_Text, RegexOptions.IgnoreCase);
+				text = Regex.Replace(text, @"\<(U(-|\\u8209\?)OTHERNUMBER)\>", _MyItemInfo.MyDocVersion.DocVersionConfig.Other_Unit_Number, RegexOptions.IgnoreCase);
 				//text = DoSearchAndReplace(text, "<U-ID>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ID);
 				text = text.Replace(@"<S\u8209?ID>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_ProcedureSetID);
 				//text = text.Replace("<U>", _MyItemInfo.MyDocVersion.DocVersionConfig.Unit_Number);
diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
index 4ede338e..acb8ebc3 100644
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@@ -1839,16 +1839,17 @@ i = 0;
 							if ((token.Equals("{EOPNUMROLU}") || token.Equals("[EOPNUMROLU]")))
 							{
 								// copied Rgex from DisplayText and modifed to remove the Parent/Child Unit information
-								// i.e. <U>, <U-ID>, <U-NAME>, <U-TEXT>, <U-NUMBER>, <U-OTHER ID>, <U-OTHER NAME>, <U-OTHER TEXT>, <U-OTHER NUMBER>
+								// i.e. <U>, <U-ID>, <U-NAME>, <U-TEXT>, <U-NUMBER>, <U-OTHERID>, <U-OTHERNAME>, <U-OTHERTEXT>, <U-OTHERNUMBER>
 								eopnum = Regex.Replace(eopnum, @"\<U\>", "", 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);
+								// B2021-148 remove space character after "OTHER"
+								eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
+								eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
+								eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERTEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
+								eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
 							}
 							else
 								eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work