From 975db3f56dfb9499240e7b359a6da72b48787ec3 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Thu, 5 Mar 2020 16:52:28 +0000
Subject: [PATCH] B2019-084: Procedure number change not updated in pasted
 transition over another transition

---
 PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs  | 4 ++++
 PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
index b8d60507..e6ba2110 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
@@ -41,6 +41,8 @@ namespace VEPROMS.CSLA.Library
 			if (forceConvertToText)
 				newvalue = "?";
       string findLink = @"<START\].*?\[END>";
+	  // B2019-084: Procedure number change not updated in pasted transition - there were 2 '<START]'s in the text so regex didn't find what was needed.
+	  if (Text.Contains("<START]<START]")) Text = Text.Replace("<START]<START]", "<START]");
       MatchCollection ms = Regex.Matches(Text, findLink, RegexOptions.Singleline);
       //string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* (.*?)(\\[^v '?\\]+)*\\v(\\[^v \\]+)* #Link:ReferencedObject:{0} .*?\[END>", rousg.ROUsageID);
 			string lookFor;
@@ -814,6 +816,8 @@ namespace VEPROMS.CSLA.Library
 			if (forceConvertToText != string.Empty)
 				newvalue = "?";
       string findLink = @"<START\].*?\[END>";
+	  // B2019-084: There were 2 '<START]'s in the text so regex didn't find what was needed to fix an updated procedure number. Note that 'Text' is read only, but _Text gets used.
+	  if (Text.Contains("<START]<START]")) _Text = Text.Replace("<START]<START]", "<START]");
       MatchCollection ms = Regex.Matches(Text, findLink);
       //string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* (.*?)(\\[^v '?\\]+)*\\v(\\[^v \\]+)* #Link:ReferencedObject:{0} .*?\[END>", rousg.ROUsageID);
 			string lookFor = string.Format(@"^<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\line ?|\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v'?{{}}~ \\]+)*\\v(\\[^v \\]+)* #Link:Transition[^:]*?:{0} {1}( [0-9]*){{1,2}}\[END>", tran.TranType, tran.TransitionID);
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index 8f571778..1ac5c516 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -896,6 +896,8 @@ namespace VEPROMS.CSLA.Library
 					bool haslinks = ((modtext.IndexOf(@"<START]") > -1) || (OriginalText != null && OriginalText != "" && OriginalText.IndexOf(@"<START]") > -1));
 					if (haslinks)
 					{
+						// B2019-084: Procedure number change not updated in pasted transition when copied text was a transition also - there were 2 '<START]'s, so replace w/ 1:
+						if (modtext.Contains("<START]<START]")) modtext = modtext.Replace("<START]<START]", "<START]");
 						// Get all links in original list
 						RtfToDisplayTextElements(OriginalText);
 						List<displayLinkElement> origList = GetLinkList(DisplayTextElementList);