C2025-024 #590

Merged
jjenko merged 18 commits from C2025-024 into Development 2025-08-08 10:19:00 -04:00
55 changed files with 2749 additions and 4576 deletions
Showing only changes of commit b5a9462e95 - Show all commits

View File

@@ -1999,6 +1999,7 @@ namespace VEPROMS
if (_UnitIndex != 0 && docver != null) if (_UnitIndex != 0 && docver != null)
{ {
docver.DocVersionConfig.SelectedSlave = _UnitIndex;
ciText = DisplayText.ResolveUnitSpecific(docver, ciText); ciText = DisplayText.ResolveUnitSpecific(docver, ciText);
if (ci.ContentRoUsageCount > 0) if (ci.ContentRoUsageCount > 0)
@@ -2012,16 +2013,18 @@ namespace VEPROMS
string roid = ROFSTLookup.FormatRoidKey(RO.ROID, true); string roid = ROFSTLookup.FormatRoidKey(RO.ROID, true);
ROFSTLookup.rochild roc = lookup.GetRoChild(roid); ROFSTLookup.rochild roc = lookup.GetRoChild(roid);
//need to search / replace in content info //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); Match m = Regex.Match(ciText, lookFor, RegexOptions.Singleline);
if (m != null && m.Groups.Count > 1) 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;
} }