diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs index eb51a4a4..76b92b49 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs @@ -937,13 +937,23 @@ namespace VEPROMS.CSLA.Library foreach (TransitionInfo myTI in myList) { //\v \v0 - string lookFor = string.Format(@"", myTI.TranType, myTI.TransitionID); + string lookFor = string.Format(@"", myTI.TranType, myTI.TransitionID); + //string lookFor = string.Format(@"", myTI.TranType, myTI.TransitionID); //string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); Match m = Regex.Match(myTI.ContentText, lookFor); if (m != null && m.Groups.Count > 1) { - System.Text.RegularExpressions.Group g = m.Groups[3]; - cc.AddTransitionFromCheck(myTI.TransitionID, g.ToString()); + int myIndex = m.Groups[4].Index; + int myLength = m.Groups[4].Length; + if (m.Groups[3].Value != " ") + { + myIndex = m.Groups[3].Index; + myLength += m.Groups[3].Length; + } + string gg = myTI.ContentText.Substring(myIndex, myLength); + cc.AddTransitionFromCheck(myTI.TransitionID, gg); +// System.Text.RegularExpressions.Group g = m.Groups[3]; +// cc.AddTransitionFromCheck(myTI.TransitionID, g.ToString()); } //_MyTimer.ActiveProcess = "get from path"; //string myPath = myTI.MyItemToID.ShortPath; @@ -954,13 +964,23 @@ namespace VEPROMS.CSLA.Library using (TransitionInfoList myList = TransitionInfoList.GetAllForProcedure(proc, false)) foreach (TransitionInfo myTI in myList) { - string lookFor = string.Format(@"", myTI.TranType, myTI.TransitionID); + string lookFor = string.Format(@"", myTI.TranType, myTI.TransitionID); + //string lookFor = string.Format(@"", myTI.TranType, myTI.TransitionID); //string lookFor = string.Format(@"", tran.TranType, tran.TransitionID); Match m = Regex.Match(myTI.ContentText, lookFor); if (m != null && m.Groups.Count > 1) { - System.Text.RegularExpressions.Group g = m.Groups[3]; - cc.AddTransitionToCheck(myTI.TransitionID, g.ToString()); + int myIndex = m.Groups[4].Index; + int myLength = m.Groups[4].Length; + if (m.Groups[3].Value != " ") + { + myIndex = m.Groups[3].Index; + myLength += m.Groups[3].Length; + } + string gg = myTI.ContentText.Substring(myIndex, myLength); + cc.AddTransitionToCheck(myTI.TransitionID, gg); +// System.Text.RegularExpressions.Group g = m.Groups[3]; +// cc.AddTransitionToCheck(myTI.TransitionID, g.ToString()); } } }