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

Browse Source
This commit is contained in:
Kathy Ruffing 2010-09-28 16:59:33 +00:00
parent 0efa235f79
commit 09bcde4bef
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PROMS/DataLoader/TransitionFixer.cs
View File

@ -79,7 +79,7 @@ namespace DataLoader
{ {
Status = string.Format("Processing {0} of {1} steps", ++i, myList.Count); Status = string.Format("Processing {0} of {1} steps", ++i, myList.Count);
MyStepRTB.ViewRTB = false; MyStepRTB.ViewRTB = false;
string originalText = item.MyContent.Text; //string originalText = item.MyContent.Text;
string updatedText = item.MyContent.Text; string updatedText = item.MyContent.Text;
//if (item.ItemID == 1850) //if (item.ItemID == 1850)
// Console.WriteLine("HERE"); // Console.WriteLine("HERE");
@ -100,11 +100,18 @@ namespace DataLoader
} }
} }
} }
MyStepRTB.MyItemInfo = item; using (Content c = item.MyContent.Get())
MyStepRTB.SaveText(); {
string afterText = item.MyContent.Text; c.Text = updatedText;
if (updatedText != afterText)//|| newStripped != afterText) c.Save();
myProblems.RTBProblems.Add(item.ItemID, item.MyContent.ContentID, originalText, updatedText, MyStepRTB.Rtf, afterText, item.Path); }
//MyStepRTB.MyItemInfo = item;
//MyStepRTB.SaveText();
//string afterText = item.MyContent.Text;
//updatedText = updatedText.Replace(@"\u160?", @"\'a0");
// aftertext is 'newrtf'
//if (updatedText != afterText)//|| newStripped != afterText)
// myProblems.RTBProblems.Add(item.ItemID, item.MyContent.ContentID, originalText, updatedText, MyStepRTB.Rtf, afterText, item.Path);
} }
//#if DEBUG //#if DEBUG
else if (VlnSettings.DebugMode) else if (VlnSettings.DebugMode)
@ -113,10 +120,10 @@ namespace DataLoader
} }
//#endif //#endif
} }
Status = "Saving problems"; //Status = "Saving problems";
ErrorCount = myProblems.RTBProblems.Count; //ErrorCount = myProblems.RTBProblems.Count;
//myProblems.Save(@"C:\temp\RTBProblems.xml"); ////myProblems.Save(@"C:\temp\RTBProblems.xml");
myProblems.Save(_LogPath + @"\RTBProblems.xml"); //myProblems.Save(_LogPath + @"\RTBProblems.xml");
Status = "Done comparing"; Status = "Done comparing";
} }

4
PROMS/DataLoader/Transitions.cs
View File

@ -101,10 +101,6 @@ namespace DataLoader
} }
else else
{ {
// if the type == 0, i.e. procedure with optional step number and the procedure does not include
// the default A0 section, point to the procedure:
if (itype == 0 && thekey.EndsWith("A0")) // may have to process these at end?
Console.WriteLine("here");
if (itype > 6) itype--; // Corrected to match transformat table (16-bit skips type 6 because it's an outside transition) if (itype > 6) itype--; // Corrected to match transformat table (16-bit skips type 6 because it's an outside transition)
if (dicTrans_ItemDone.ContainsKey(thekey)) if (dicTrans_ItemDone.ContainsKey(thekey))
{ {