diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs index 1b3002cc..f6ba23fe 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs @@ -1975,9 +1975,6 @@ namespace RODBInterface elem.SetAttribute("RecID", RecID); elem.SetAttribute("ParentID", node.GetAttribute("RecID")); elem.SetAttribute("Table", node.GetAttribute("Table")); - //AccPageID = Regex.Replace(AccPageID, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); // RO Editor add symbols C2022 - 003 - string pattern = @"\\u([0-9]{1,4})\?"; - AccPageID = Regex.Replace(AccPageID, pattern, ""); // Remove any symbols from AccPageID - RO Editor add symbols C2022 - 003 elem.SetAttribute("AccPageID", AccPageID); } } diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index d4d09fdc..0c03e5e6 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -1,14 +1,14 @@ +using Csla.Data; using System; using System.Collections.Generic; -using System.Text; using System.ComponentModel; -using System.Text.RegularExpressions; using System.Data; using System.Data.SqlClient; using System.Linq; +using System.Text; +using System.Text.RegularExpressions; using System.Threading; - -using Csla.Data; +using static System.Net.Mime.MediaTypeNames; namespace VEPROMS.CSLA.Library @@ -2154,15 +2154,8 @@ namespace VEPROMS.CSLA.Library if (string.IsNullOrEmpty(s2)) return s2; - var pattern = @"\\u([0-9]{1,4})\?"; // RO Editor add symbols C2022 - 003 - - if (Regex.IsMatch(s2, pattern)) - s2 = s2.Replace(@"\u160?", ""); // convert hard spaces bug fix: B2016-206 - if (!Regex.IsMatch(s2, pattern)) // RO Editor add symbols C2022 - 003 - { - s2 = s2.Replace(@"\", @"\u9586?"); // convert backslashes to a backslash symbol - } + s2 = s2.Replace(@"\(?!u)", @"\u9586?"); // convert backslashes to a backslash symbol s2 = s2.Replace("", @"\u160?"); // convert hard spaces bug fix: B2016-206 s2 = s2.Replace("`", @"\'b0"); // convert backquote to degree - left over from DOS days. s2 = s2.Replace("\xf8", @"\'b0"); // convert \xf8 to degree.