From b5a9462e956507696cb9b0152f349036982c660c Mon Sep 17 00:00:00 2001
From: mschill <mschill@volian.com>
Date: Wed, 6 Aug 2025 14:41:15 -0400
Subject: [PATCH] C2025-024 Electronic Procedures - Phase 2 (PROMS XML output) 
 Fix Regular Expression RO Resolution for when multi ROs  and multi-unit

---
 PROMS/VEPROMS User Interface/dlgExportImport.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/PROMS/VEPROMS User Interface/dlgExportImport.cs b/PROMS/VEPROMS User Interface/dlgExportImport.cs
index 5e56d913..df2e4acb 100644
--- a/PROMS/VEPROMS User Interface/dlgExportImport.cs	
+++ b/PROMS/VEPROMS User Interface/dlgExportImport.cs	
@@ -1999,6 +1999,7 @@ namespace VEPROMS
 
 			if (_UnitIndex != 0 && docver != null)
 			{
+				docver.DocVersionConfig.SelectedSlave = _UnitIndex;
 				ciText = DisplayText.ResolveUnitSpecific(docver, ciText);
 
 				if (ci.ContentRoUsageCount > 0)
@@ -2012,16 +2013,18 @@ namespace VEPROMS
 							string roid = ROFSTLookup.FormatRoidKey(RO.ROID, true);
 							ROFSTLookup.rochild roc = lookup.GetRoChild(roid);
 							//need to search / replace in content info
-							string lookFor = string.Format(@"(<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~]))(.*?)((\\[^v'?{{}}~ \\]+)*\\v(\\[^v \\]+)* #Link:ReferencedObject:{0} .*?\[END>)", RO.ROUsageID);
+							string lookFor = string.Format(@"(?<=((<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])))(.*?))((\\[^v'?{{}}~ \\]+)*\\v(\\[^v \\]+)* #Link:ReferencedObject:{0} .*?\[END>)", RO.ROUsageID);
 							Match m = Regex.Match(ciText, lookFor, RegexOptions.Singleline);
 							if (m != null && m.Groups.Count > 1)
 							{
-								ciText = ciText.Replace($"{m.Groups[1].Value}{m.Groups[5].Value}{m.Groups[6].Value}", $"{m.Groups[1].Value}{roc.value}{m.Groups[6].Value}");
+								ciText = ciText.Replace($"{m.Groups[1].Value}{m.Groups[6].Value}{m.Groups[7].Value}", $"{m.Groups[1].Value}{roc.value}{m.Groups[7].Value}");
 							}
 						}
 					}
 
 				}
+
+				docver.DocVersionConfig.SelectedSlave = 0;
 			}