Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Changed BuildTransitionFromChecks and BuildTransitionToChecks methods to handle curly braces.

Browse Source
This commit is contained in:
Rich 2014-05-23 01:16:26 +00:00
parent afd50f8c19
commit 829be02c4b
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PROMS/VEPROMS.CSLA.Library/Extension/RevisionInfoExt.cs
View File

@ -937,13 +937,23 @@ namespace VEPROMS.CSLA.Library
foreach (TransitionInfo myTI in myList) foreach (TransitionInfo myTI in myList)
{ {
//\v <START]\v0 EMG\u160?ES\u8209?02, REACTOR TRIP RESPONSE, Step 14\v #Link:Transition:0 1 102[END>\v0 //\v <START]\v0 EMG\u160?ES\u8209?02, REACTOR TRIP RESPONSE, Step 14\v #Link:Transition:0 1 102[END>\v0
string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* ([^#]*?)(\\[^v'? \\]+)*\\v(\\[^v \\]+)* #Link:Transition[^:]*?:{0} {1}( [0-9]*){{1,2}}\[END>", myTI.TranType, myTI.TransitionID); string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v'?{{}}~ \\]+)*\\v(\\[^v \\]+)* #Link:Transition[^:]*?:{0} {1}( [0-9]*){{1,2}}\[END>", myTI.TranType, myTI.TransitionID);
//string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* ([^#]*?)(\\[^v'? \\]+)*\\v(\\[^v \\]+)* #Link:Transition[^:]*?:{0} {1}( [0-9]*){{1,2}}\[END>", myTI.TranType, myTI.TransitionID);
//string lookFor = string.Format(@"<START\]\\v0 ([^#]*?)\\v #Link:Transition[^:]*?:{0} {1} [0-9]*\[END>", tran.TranType, tran.TransitionID); //string lookFor = string.Format(@"<START\]\\v0 ([^#]*?)\\v #Link:Transition[^:]*?:{0} {1} [0-9]*\[END>", tran.TranType, tran.TransitionID);
Match m = Regex.Match(myTI.ContentText, lookFor); Match m = Regex.Match(myTI.ContentText, lookFor);
if (m != null && m.Groups.Count > 1) if (m != null && m.Groups.Count > 1)
{ {
System.Text.RegularExpressions.Group g = m.Groups[3]; int myIndex = m.Groups[4].Index;
cc.AddTransitionFromCheck(myTI.TransitionID, g.ToString()); 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"; //_MyTimer.ActiveProcess = "get from path";
//string myPath = myTI.MyItemToID.ShortPath; //string myPath = myTI.MyItemToID.ShortPath;
@ -954,13 +964,23 @@ namespace VEPROMS.CSLA.Library
using (TransitionInfoList myList = TransitionInfoList.GetAllForProcedure(proc, false)) using (TransitionInfoList myList = TransitionInfoList.GetAllForProcedure(proc, false))
foreach (TransitionInfo myTI in myList) foreach (TransitionInfo myTI in myList)
{ {
string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* ([^#]*?)(\\[^v'? \\]+)*\\v(\\[^v \\]+)* #Link:Transition[^:]*?:{0} {1}( [0-9]*){{1,2}}\[END>", myTI.TranType, myTI.TransitionID); string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v '?{{}}~\\]+)*( |\\u[0-9]{{1,4}}?|\\'[0-9a-fA-F]{{2}}|\\[{{}}~])(.*?)(\\[^v'?{{}}~ \\]+)*\\v(\\[^v \\]+)* #Link:Transition[^:]*?:{0} {1}( [0-9]*){{1,2}}\[END>", myTI.TranType, myTI.TransitionID);
//string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* ([^#]*?)(\\[^v'? \\]+)*\\v(\\[^v \\]+)* #Link:Transition[^:]*?:{0} {1}( [0-9]*){{1,2}}\[END>", myTI.TranType, myTI.TransitionID);
//string lookFor = string.Format(@"<START\]\\v0 ([^#]*?)\\v #Link:Transition[^:]*?:{0} {1} [0-9]*\[END>", tran.TranType, tran.TransitionID); //string lookFor = string.Format(@"<START\]\\v0 ([^#]*?)\\v #Link:Transition[^:]*?:{0} {1} [0-9]*\[END>", tran.TranType, tran.TransitionID);
Match m = Regex.Match(myTI.ContentText, lookFor); Match m = Regex.Match(myTI.ContentText, lookFor);
if (m != null && m.Groups.Count > 1) if (m != null && m.Groups.Count > 1)
{ {
System.Text.RegularExpressions.Group g = m.Groups[3]; int myIndex = m.Groups[4].Index;
cc.AddTransitionToCheck(myTI.TransitionID, g.ToString()); 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());
} }
} }
} }