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

Added option to check RTF with StepRTB

Browse Source 
Use Temporary Folder for SearchResults
Remove override of Equals - return to default
Comment-out Debug
Remove PDFs that are older than one hour
Added a ShowLocalStack that takes a format and a list of parameters
This commit is contained in:
Rich 2010-10-12 14:59:23 +00:00
parent d3c6e41a5a
commit dc6721f54c
9 changed files with 209 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
PROMS/DataLoader/TransitionFixer.cs
View File

@ -62,13 +62,13 @@ namespace DataLoader
_MyStepRTB = myStepRTB;
_LogPath = logpath;
}
public TimeSpan Process()
public TimeSpan Process(bool checkRTF)
{
DateTime tstart = DateTime.Now;
ProcessTransitions();
ProcessTransitions(checkRTF);
return DateTime.Now - tstart;
}
private void ProcessTransitions()
private void ProcessTransitions(bool checkRTF)
{
Status = "Getting List...";
// Loop through all Items and check before and after text
@ -81,6 +81,7 @@ namespace DataLoader
MyStepRTB.ViewRTB = false;
string originalText = item.MyContent.Text;
string updatedText = item.MyContent.Text;
// Exclude items that are not connected (Dummy steps for invalid transition destinations)
if (item.ItemDocVersionCount != 0 || item.MyPrevious != null || item.MyParent != null)
{
if (item.MyContent.ContentTransitionCount > 0)
@ -104,35 +105,43 @@ namespace DataLoader
c.Text = updatedText;
c.Save();
}
MyStepRTB.MyItemInfo = item;
MyStepRTB.SaveText();
string afterText = item.MyContent.Text;
// aftertext is 'newrtf'
if (afterText != updatedText)
myProblems.RTBProblems.Add(item.ItemID, item.MyContent.ContentID, originalText, updatedText, MyStepRTB.Rtf, afterText, item.Path);
if (checkRTF)
{
MyStepRTB.MyItemInfo = item;
MyStepRTB.SaveText(true); // Force Save - This will put change bars on everything
string afterText = item.MyContent.Text;
// aftertext is 'newrtf'
if (afterText != updatedText)
myProblems.RTBProblems.Add(item.ItemID, item.MyContent.ContentID, originalText, updatedText, MyStepRTB.Rtf, afterText, item.Path);
}
}
}
if (checkRTF)
{
Status = "Saving problems";
string logFile = _LogPath + @"\RTBProblems.xml";
ErrorCount = myProblems.RTBProblems.Count;
myProblems.Save(logFile);
if (ErrorCount > 0)
{
System.Windows.Forms.DialogResult answer = System.Windows.Forms.MessageBox.Show(
string.Format("{0} Differences found in Transition Text\r\nResults in {1}\r\n\r\nOpen Log File?",
ErrorCount, logFile), "Transitions Different", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question);
if(answer == System.Windows.Forms.DialogResult.Yes)
System.Diagnostics.Process.Start(logFile);
}
//#if DEBUG
else if (VlnSettings.DebugMode)
{
Console.WriteLine("here");
}
//#endif
}
//Status = "Saving problems";
//ErrorCount = myProblems.RTBProblems.Count;
////myProblems.Save(@"C:\temp\RTBProblems.xml");
myProblems.Save(_LogPath + @"\RTBProblems.xml");
Status = "Done comparing";
}
public string FixTransitionText(string Text, TransitionInfo tran)
{
string lookFor = string.Format(@"<START\]\\v0 ([^#]*?)\\v #Link:Transition[^:]*?:{0} {1}( [0-9]*){2}\[END>", tran.TranType, tran.TransitionID, "{1,2}");
Console.WriteLine(">>>>> FixTransitionText");
Console.WriteLine("Text = {0}", Text);
Console.WriteLine("lookFor = {0}", lookFor);
string transText = tran.ResolvePathTo();
Console.WriteLine("TransText = {0}", transText);
//Console.WriteLine(">>>>> FixTransitionText");
//Console.WriteLine("Text = {0}", Text);
//Console.WriteLine("lookFor = {0}", lookFor);
//Console.WriteLine("TransText = {0}", transText);
Match m = Regex.Match(Text, lookFor);
if (m != null && m.Groups.Count > 1)
{

279
PROMS/DataLoader/frmLoader.Designer.cs generated
View File

@ -31,6 +31,7 @@ namespace DataLoader
{
this.components = new System.ComponentModel.Container();
this.sc = new System.Windows.Forms.SplitContainer();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.tbxBackupFileName = new System.Windows.Forms.TextBox();
this.lblBackupName = new System.Windows.Forms.Label();
this.lblProms16BitLoc = new System.Windows.Forms.Label();
@ -73,7 +74,7 @@ namespace DataLoader
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.tsslError = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.cbCheckRTF = new System.Windows.Forms.CheckBox();
this.sc.Panel1.SuspendLayout();
this.sc.Panel2.SuspendLayout();
this.sc.SuspendLayout();
@ -84,12 +85,13 @@ namespace DataLoader
//
this.sc.Dock = System.Windows.Forms.DockStyle.Fill;
this.sc.Location = new System.Drawing.Point(0, 0);
this.sc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.sc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.sc.Name = "sc";
this.sc.Orientation = System.Windows.Forms.Orientation.Horizontal;
//
// sc.Panel1
//
this.sc.Panel1.Controls.Add(this.cbCheckRTF);
this.sc.Panel1.Controls.Add(this.checkBox1);
this.sc.Panel1.Controls.Add(this.tbxBackupFileName);
this.sc.Panel1.Controls.Add(this.lblBackupName);
@ -133,29 +135,45 @@ namespace DataLoader
//
this.sc.Panel2.BackColor = System.Drawing.SystemColors.Control;
this.sc.Panel2.Controls.Add(this.tv);
this.sc.Size = new System.Drawing.Size(886, 545);
this.sc.SplitterDistance = 313;
this.sc.Size = new System.Drawing.Size(664, 486);
this.sc.SplitterDistance = 279;
this.sc.SplitterWidth = 3;
this.sc.TabIndex = 46;
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox1.Location = new System.Drawing.Point(537, 77);
this.checkBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(70, 17);
this.checkBox1.TabIndex = 85;
this.checkBox1.Text = "Red PDF";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// tbxBackupFileName
//
this.tbxBackupFileName.BackColor = System.Drawing.SystemColors.Info;
this.tbxBackupFileName.Location = new System.Drawing.Point(137, 92);
this.tbxBackupFileName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbxBackupFileName.Location = new System.Drawing.Point(103, 75);
this.tbxBackupFileName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbxBackupFileName.Name = "tbxBackupFileName";
this.tbxBackupFileName.Size = new System.Drawing.Size(268, 22);
this.tbxBackupFileName.Size = new System.Drawing.Size(202, 20);
this.tbxBackupFileName.TabIndex = 84;
this.tbxBackupFileName.Text = "VEPROMS.bak";
this.toolTip1.SetToolTip(this.tbxBackupFileName, "The file name that will be used in the backup and restore batch files\r\nthat will " +
"be created in the same folder as the conversion log files.");
"be created in the same folder as the conversion log files.");
//
// lblBackupName
//
this.lblBackupName.AutoSize = true;
this.lblBackupName.BackColor = System.Drawing.SystemColors.Info;
this.lblBackupName.Location = new System.Drawing.Point(5, 95);
this.lblBackupName.Location = new System.Drawing.Point(4, 77);
this.lblBackupName.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblBackupName.Name = "lblBackupName";
this.lblBackupName.Size = new System.Drawing.Size(126, 17);
this.lblBackupName.Size = new System.Drawing.Size(97, 13);
this.lblBackupName.TabIndex = 83;
this.lblBackupName.Text = "Backup File Name:";
//
@ -163,9 +181,10 @@ namespace DataLoader
//
this.lblProms16BitLoc.AutoSize = true;
this.lblProms16BitLoc.BackColor = System.Drawing.SystemColors.Control;
this.lblProms16BitLoc.Location = new System.Drawing.Point(5, 38);
this.lblProms16BitLoc.Location = new System.Drawing.Point(4, 31);
this.lblProms16BitLoc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblProms16BitLoc.Name = "lblProms16BitLoc";
this.lblProms16BitLoc.Size = new System.Drawing.Size(143, 17);
this.lblProms16BitLoc.Size = new System.Drawing.Size(110, 13);
this.lblProms16BitLoc.TabIndex = 82;
this.lblProms16BitLoc.Text = "VE-PROMS Location:";
//
@ -173,9 +192,10 @@ namespace DataLoader
//
this.cbxOnlyThisSet.AutoSize = true;
this.cbxOnlyThisSet.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
this.cbxOnlyThisSet.Location = new System.Drawing.Point(31, 149);
this.cbxOnlyThisSet.Location = new System.Drawing.Point(23, 121);
this.cbxOnlyThisSet.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbxOnlyThisSet.Name = "cbxOnlyThisSet";
this.cbxOnlyThisSet.Size = new System.Drawing.Size(119, 21);
this.cbxOnlyThisSet.Size = new System.Drawing.Size(92, 17);
this.cbxOnlyThisSet.TabIndex = 81;
this.cbxOnlyThisSet.Text = "Only This Set:";
this.cbxOnlyThisSet.UseVisualStyleBackColor = false;
@ -184,10 +204,10 @@ namespace DataLoader
// btnLogLoc
//
this.btnLogLoc.BackColor = System.Drawing.SystemColors.Info;
this.btnLogLoc.Location = new System.Drawing.Point(716, 62);
this.btnLogLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnLogLoc.Location = new System.Drawing.Point(537, 50);
this.btnLogLoc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnLogLoc.Name = "btnLogLoc";
this.btnLogLoc.Size = new System.Drawing.Size(158, 25);
this.btnLogLoc.Size = new System.Drawing.Size(118, 20);
this.btnLogLoc.TabIndex = 79;
this.btnLogLoc.Text = "[1] Log File Location...";
this.btnLogLoc.UseVisualStyleBackColor = false;
@ -196,38 +216,39 @@ namespace DataLoader
// txbLogFileLoc
//
this.txbLogFileLoc.BackColor = System.Drawing.SystemColors.Info;
this.txbLogFileLoc.Location = new System.Drawing.Point(131, 63);
this.txbLogFileLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txbLogFileLoc.Location = new System.Drawing.Point(98, 51);
this.txbLogFileLoc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txbLogFileLoc.Name = "txbLogFileLoc";
this.txbLogFileLoc.Size = new System.Drawing.Size(578, 22);
this.txbLogFileLoc.Size = new System.Drawing.Size(434, 20);
this.txbLogFileLoc.TabIndex = 78;
this.txbLogFileLoc.Text = "\\\\Volian-server\\04 ve-proms files\\Active Project Files\\32 Bit VE-PROMS\\Data Migra" +
"tion";
"tion";
this.toolTip1.SetToolTip(this.txbLogFileLoc, "The location to place the conversion log files.\r\nCreate a folder for each plant.\r" +
"\nType in or use the Browse button at the right.");
"\nType in or use the Browse button at the right.");
this.txbLogFileLoc.TextChanged += new System.EventHandler(this.txbLogFileLoc_TextChanged);
//
// lblLogFileLoc
//
this.lblLogFileLoc.AutoSize = true;
this.lblLogFileLoc.BackColor = System.Drawing.SystemColors.Info;
this.lblLogFileLoc.Location = new System.Drawing.Point(5, 66);
this.lblLogFileLoc.Location = new System.Drawing.Point(4, 54);
this.lblLogFileLoc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblLogFileLoc.Name = "lblLogFileLoc";
this.lblLogFileLoc.Size = new System.Drawing.Size(120, 17);
this.lblLogFileLoc.Size = new System.Drawing.Size(91, 13);
this.lblLogFileLoc.TabIndex = 77;
this.lblLogFileLoc.Text = "Log File Location:";
//
// btnFixTransitions
//
this.btnFixTransitions.BackColor = System.Drawing.SystemColors.Info;
this.btnFixTransitions.Location = new System.Drawing.Point(8, 232);
this.btnFixTransitions.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnFixTransitions.Location = new System.Drawing.Point(6, 188);
this.btnFixTransitions.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnFixTransitions.Name = "btnFixTransitions";
this.btnFixTransitions.Size = new System.Drawing.Size(86, 44);
this.btnFixTransitions.Size = new System.Drawing.Size(64, 36);
this.btnFixTransitions.TabIndex = 76;
this.btnFixTransitions.Text = "[3] Fix Transitions";
this.toolTip1.SetToolTip(this.btnFixTransitions, "Do this after you convert the data.\r\nThis will place the proper text in\r\nthe tran" +
"sition links.");
"sition links.");
this.btnFixTransitions.UseVisualStyleBackColor = false;
this.btnFixTransitions.Click += new System.EventHandler(this.btnFixTransitions_Click);
//
@ -235,9 +256,10 @@ namespace DataLoader
//
this.lblCurSetFolder.AutoSize = true;
this.lblCurSetFolder.ForeColor = System.Drawing.Color.Blue;
this.lblCurSetFolder.Location = new System.Drawing.Point(240, 288);
this.lblCurSetFolder.Location = new System.Drawing.Point(178, 257);
this.lblCurSetFolder.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblCurSetFolder.Name = "lblCurSetFolder";
this.lblCurSetFolder.Size = new System.Drawing.Size(20, 17);
this.lblCurSetFolder.Size = new System.Drawing.Size(16, 13);
this.lblCurSetFolder.TabIndex = 75;
this.lblCurSetFolder.Text = "...";
this.lblCurSetFolder.Visible = false;
@ -245,9 +267,10 @@ namespace DataLoader
// lblProcessing
//
this.lblProcessing.AutoSize = true;
this.lblProcessing.Location = new System.Drawing.Point(13, 288);
this.lblProcessing.Location = new System.Drawing.Point(8, 257);
this.lblProcessing.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblProcessing.Name = "lblProcessing";
this.lblProcessing.Size = new System.Drawing.Size(221, 17);
this.lblProcessing.Size = new System.Drawing.Size(165, 13);
this.lblProcessing.TabIndex = 74;
this.lblProcessing.Text = "Processing Procedure Set Folder:";
this.lblProcessing.Visible = false;
@ -255,10 +278,10 @@ namespace DataLoader
// cbFormatsOnly
//
this.cbFormatsOnly.AutoSize = true;
this.cbFormatsOnly.Location = new System.Drawing.Point(715, 284);
this.cbFormatsOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbFormatsOnly.Location = new System.Drawing.Point(536, 231);
this.cbFormatsOnly.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbFormatsOnly.Name = "cbFormatsOnly";
this.cbFormatsOnly.Size = new System.Drawing.Size(114, 21);
this.cbFormatsOnly.Size = new System.Drawing.Size(87, 17);
this.cbFormatsOnly.TabIndex = 73;
this.cbFormatsOnly.Text = "Formats Only";
this.cbFormatsOnly.UseVisualStyleBackColor = true;
@ -267,10 +290,10 @@ namespace DataLoader
// btnBrowseVeProms
//
this.btnBrowseVeProms.BackColor = System.Drawing.SystemColors.Control;
this.btnBrowseVeProms.Location = new System.Drawing.Point(715, 34);
this.btnBrowseVeProms.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnBrowseVeProms.Location = new System.Drawing.Point(536, 28);
this.btnBrowseVeProms.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnBrowseVeProms.Name = "btnBrowseVeProms";
this.btnBrowseVeProms.Size = new System.Drawing.Size(159, 25);
this.btnBrowseVeProms.Size = new System.Drawing.Size(119, 20);
this.btnBrowseVeProms.TabIndex = 72;
this.btnBrowseVeProms.Text = "Browse for VeProms...";
this.toolTip1.SetToolTip(this.btnBrowseVeProms, "Browser for the location of VE-PROMS (16-bit version)");
@ -280,22 +303,21 @@ namespace DataLoader
// tbVePromsPath
//
this.tbVePromsPath.BackColor = System.Drawing.SystemColors.Window;
this.tbVePromsPath.Location = new System.Drawing.Point(152, 36);
this.tbVePromsPath.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbVePromsPath.Location = new System.Drawing.Point(114, 29);
this.tbVePromsPath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbVePromsPath.Name = "tbVePromsPath";
this.tbVePromsPath.Size = new System.Drawing.Size(557, 22);
this.tbVePromsPath.Size = new System.Drawing.Size(419, 20);
this.tbVePromsPath.TabIndex = 71;
this.tbVePromsPath.Text = "C:\\16bit\\VE-PROMS";
this.toolTip1.SetToolTip(this.tbVePromsPath, "Type in the location of VE-PROMS (16-bit version)\r\nOR use the Browse button at th" +
"e right.");
"e right.");
this.tbVePromsPath.TextChanged += new System.EventHandler(this.tbVePromsPath_TextChanged);
//
// btnCtTok
//
this.btnCtTok.Location = new System.Drawing.Point(649, 5);
this.btnCtTok.Margin = new System.Windows.Forms.Padding(4);
this.btnCtTok.Location = new System.Drawing.Point(487, 4);
this.btnCtTok.Name = "btnCtTok";
this.btnCtTok.Size = new System.Drawing.Size(128, 23);
this.btnCtTok.Size = new System.Drawing.Size(96, 19);
this.btnCtTok.TabIndex = 70;
this.btnCtTok.Text = "Count Tokens";
this.btnCtTok.UseVisualStyleBackColor = true;
@ -304,10 +326,9 @@ namespace DataLoader
//
// btnGroup
//
this.btnGroup.Location = new System.Drawing.Point(522, 5);
this.btnGroup.Margin = new System.Windows.Forms.Padding(4);
this.btnGroup.Location = new System.Drawing.Point(392, 4);
this.btnGroup.Name = "btnGroup";
this.btnGroup.Size = new System.Drawing.Size(119, 23);
this.btnGroup.Size = new System.Drawing.Size(89, 19);
this.btnGroup.TabIndex = 69;
this.btnGroup.Text = "Group/Security";
this.btnGroup.UseVisualStyleBackColor = true;
@ -316,10 +337,9 @@ namespace DataLoader
//
// btnVETree_CSLA
//
this.btnVETree_CSLA.Location = new System.Drawing.Point(337, 5);
this.btnVETree_CSLA.Margin = new System.Windows.Forms.Padding(4);
this.btnVETree_CSLA.Location = new System.Drawing.Point(253, 4);
this.btnVETree_CSLA.Name = "btnVETree_CSLA";
this.btnVETree_CSLA.Size = new System.Drawing.Size(177, 23);
this.btnVETree_CSLA.Size = new System.Drawing.Size(133, 19);
this.btnVETree_CSLA.TabIndex = 68;
this.btnVETree_CSLA.Text = "Load VETree from CSLA";
this.btnVETree_CSLA.UseVisualStyleBackColor = true;
@ -328,10 +348,10 @@ namespace DataLoader
//
// btnBrowseVesam
//
this.btnBrowseVesam.Location = new System.Drawing.Point(716, 120);
this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnBrowseVesam.Location = new System.Drawing.Point(537, 98);
this.btnBrowseVesam.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnBrowseVesam.Name = "btnBrowseVesam";
this.btnBrowseVesam.Size = new System.Drawing.Size(159, 24);
this.btnBrowseVesam.Size = new System.Drawing.Size(119, 20);
this.btnBrowseVesam.TabIndex = 67;
this.btnBrowseVesam.Text = "Browse for Vesam...";
this.btnBrowseVesam.UseVisualStyleBackColor = true;
@ -340,20 +360,18 @@ namespace DataLoader
//
// tbVesamPath
//
this.tbVesamPath.Location = new System.Drawing.Point(152, 120);
this.tbVesamPath.Margin = new System.Windows.Forms.Padding(4);
this.tbVesamPath.Location = new System.Drawing.Point(114, 98);
this.tbVesamPath.Name = "tbVesamPath";
this.tbVesamPath.Size = new System.Drawing.Size(557, 22);
this.tbVesamPath.Size = new System.Drawing.Size(419, 20);
this.tbVesamPath.TabIndex = 66;
this.tbVesamPath.Text = "C:\\16bit\\Ve-proms\\vesam.opt";
this.tbVesamPath.Visible = false;
//
// btnVesam
//
this.btnVesam.Location = new System.Drawing.Point(4, 118);
this.btnVesam.Margin = new System.Windows.Forms.Padding(4);
this.btnVesam.Location = new System.Drawing.Point(3, 96);
this.btnVesam.Name = "btnVesam";
this.btnVesam.Size = new System.Drawing.Size(144, 26);
this.btnVesam.Size = new System.Drawing.Size(108, 21);
this.btnVesam.TabIndex = 65;
this.btnVesam.Text = "Convert Security";
this.btnVesam.UseVisualStyleBackColor = true;
@ -362,10 +380,9 @@ namespace DataLoader
//
// btnLoadTreeCSLA
//
this.btnLoadTreeCSLA.Location = new System.Drawing.Point(170, 5);
this.btnLoadTreeCSLA.Margin = new System.Windows.Forms.Padding(4);
this.btnLoadTreeCSLA.Location = new System.Drawing.Point(128, 4);
this.btnLoadTreeCSLA.Name = "btnLoadTreeCSLA";
this.btnLoadTreeCSLA.Size = new System.Drawing.Size(159, 23);
this.btnLoadTreeCSLA.Size = new System.Drawing.Size(119, 19);
this.btnLoadTreeCSLA.TabIndex = 64;
this.btnLoadTreeCSLA.Text = "Load Tree from CSLA";
this.btnLoadTreeCSLA.UseVisualStyleBackColor = true;
@ -377,10 +394,10 @@ namespace DataLoader
this.cbLazy.AutoSize = true;
this.cbLazy.Checked = true;
this.cbLazy.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLazy.Location = new System.Drawing.Point(715, 259);
this.cbLazy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbLazy.Location = new System.Drawing.Point(536, 210);
this.cbLazy.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbLazy.Name = "cbLazy";
this.cbLazy.Size = new System.Drawing.Size(96, 21);
this.cbLazy.Size = new System.Drawing.Size(75, 17);
this.cbLazy.TabIndex = 63;
this.cbLazy.Text = "Lazy Load";
this.cbLazy.UseVisualStyleBackColor = true;
@ -388,10 +405,10 @@ namespace DataLoader
//
// btnConvertSelected
//
this.btnConvertSelected.Location = new System.Drawing.Point(226, 257);
this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnConvertSelected.Location = new System.Drawing.Point(170, 209);
this.btnConvertSelected.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnConvertSelected.Name = "btnConvertSelected";
this.btnConvertSelected.Size = new System.Drawing.Size(201, 23);
this.btnConvertSelected.Size = new System.Drawing.Size(151, 19);
this.btnConvertSelected.TabIndex = 62;
this.btnConvertSelected.Text = "Convert Dbf Selected In Tree";
this.btnConvertSelected.UseVisualStyleBackColor = true;
@ -400,10 +417,10 @@ namespace DataLoader
//
// btnLoadTreeDB
//
this.btnLoadTreeDB.Location = new System.Drawing.Point(6, 5);
this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnLoadTreeDB.Location = new System.Drawing.Point(4, 4);
this.btnLoadTreeDB.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnLoadTreeDB.Name = "btnLoadTreeDB";
this.btnLoadTreeDB.Size = new System.Drawing.Size(157, 23);
this.btnLoadTreeDB.Size = new System.Drawing.Size(118, 19);
this.btnLoadTreeDB.TabIndex = 60;
this.btnLoadTreeDB.Text = "Convert Top Folders";
this.btnLoadTreeDB.UseVisualStyleBackColor = true;
@ -415,10 +432,10 @@ namespace DataLoader
this.cbPurgeData.AutoSize = true;
this.cbPurgeData.Checked = true;
this.cbPurgeData.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbPurgeData.Location = new System.Drawing.Point(715, 232);
this.cbPurgeData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbPurgeData.Location = new System.Drawing.Point(536, 188);
this.cbPurgeData.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbPurgeData.Name = "cbPurgeData";
this.cbPurgeData.Size = new System.Drawing.Size(154, 21);
this.cbPurgeData.Size = new System.Drawing.Size(119, 17);
this.cbPurgeData.TabIndex = 59;
this.cbPurgeData.Text = "Purge Existing Data";
this.cbPurgeData.UseVisualStyleBackColor = true;
@ -427,33 +444,34 @@ namespace DataLoader
// lblTime
//
this.lblTime.BackColor = System.Drawing.SystemColors.ButtonShadow;
this.lblTime.Location = new System.Drawing.Point(108, 251);
this.lblTime.Location = new System.Drawing.Point(81, 204);
this.lblTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblTime.Name = "lblTime";
this.lblTime.Size = new System.Drawing.Size(112, 25);
this.lblTime.Size = new System.Drawing.Size(84, 20);
this.lblTime.TabIndex = 58;
//
// pbStep
//
this.pbStep.Location = new System.Drawing.Point(226, 228);
this.pbStep.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pbStep.Location = new System.Drawing.Point(170, 185);
this.pbStep.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pbStep.Name = "pbStep";
this.pbStep.Size = new System.Drawing.Size(483, 18);
this.pbStep.Size = new System.Drawing.Size(362, 15);
this.pbStep.TabIndex = 57;
//
// pbSect
//
this.pbSect.Location = new System.Drawing.Point(226, 206);
this.pbSect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pbSect.Location = new System.Drawing.Point(170, 167);
this.pbSect.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pbSect.Name = "pbSect";
this.pbSect.Size = new System.Drawing.Size(483, 18);
this.pbSect.Size = new System.Drawing.Size(362, 15);
this.pbSect.TabIndex = 56;
//
// pbProc
//
this.pbProc.Location = new System.Drawing.Point(226, 182);
this.pbProc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pbProc.Location = new System.Drawing.Point(170, 148);
this.pbProc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.pbProc.Name = "pbProc";
this.pbProc.Size = new System.Drawing.Size(483, 18);
this.pbProc.Size = new System.Drawing.Size(362, 15);
this.pbProc.TabIndex = 55;
//
// cbSaveDoc
@ -461,10 +479,10 @@ namespace DataLoader
this.cbSaveDoc.AutoSize = true;
this.cbSaveDoc.Checked = true;
this.cbSaveDoc.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbSaveDoc.Location = new System.Drawing.Point(716, 182);
this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbSaveDoc.Location = new System.Drawing.Point(537, 148);
this.cbSaveDoc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbSaveDoc.Name = "cbSaveDoc";
this.cbSaveDoc.Size = new System.Drawing.Size(96, 21);
this.cbSaveDoc.Size = new System.Drawing.Size(77, 17);
this.cbSaveDoc.TabIndex = 54;
this.cbSaveDoc.Text = "Save DOC";
this.cbSaveDoc.UseVisualStyleBackColor = true;
@ -474,10 +492,10 @@ namespace DataLoader
// cbSaveRTF
//
this.cbSaveRTF.AutoSize = true;
this.cbSaveRTF.Location = new System.Drawing.Point(716, 207);
this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cbSaveRTF.Location = new System.Drawing.Point(537, 168);
this.cbSaveRTF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cbSaveRTF.Name = "cbSaveRTF";
this.cbSaveRTF.Size = new System.Drawing.Size(93, 21);
this.cbSaveRTF.Size = new System.Drawing.Size(75, 17);
this.cbSaveRTF.TabIndex = 53;
this.cbSaveRTF.Text = "Save RTF";
this.cbSaveRTF.UseVisualStyleBackColor = true;
@ -487,10 +505,10 @@ namespace DataLoader
// btnBrowse
//
this.btnBrowse.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
this.btnBrowse.Location = new System.Drawing.Point(716, 148);
this.btnBrowse.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnBrowse.Location = new System.Drawing.Point(537, 120);
this.btnBrowse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnBrowse.Name = "btnBrowse";
this.btnBrowse.Size = new System.Drawing.Size(158, 23);
this.btnBrowse.Size = new System.Drawing.Size(118, 19);
this.btnBrowse.TabIndex = 52;
this.btnBrowse.Text = "Browse For Set...";
this.btnBrowse.UseVisualStyleBackColor = false;
@ -500,10 +518,10 @@ namespace DataLoader
// tbSource
//
this.tbSource.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
this.tbSource.Location = new System.Drawing.Point(152, 148);
this.tbSource.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tbSource.Location = new System.Drawing.Point(114, 120);
this.tbSource.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tbSource.Name = "tbSource";
this.tbSource.Size = new System.Drawing.Size(557, 22);
this.tbSource.Size = new System.Drawing.Size(419, 20);
this.tbSource.TabIndex = 51;
this.tbSource.Text = "i:\\vedata\\vewcnfp\\fp.prc";
this.tbSource.Visible = false;
@ -511,38 +529,41 @@ namespace DataLoader
// lblStep
//
this.lblStep.BackColor = System.Drawing.SystemColors.ButtonShadow;
this.lblStep.Location = new System.Drawing.Point(108, 226);
this.lblStep.Location = new System.Drawing.Point(81, 184);
this.lblStep.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblStep.Name = "lblStep";
this.lblStep.Size = new System.Drawing.Size(112, 25);
this.lblStep.Size = new System.Drawing.Size(84, 20);
this.lblStep.TabIndex = 49;
//
// lblSection
//
this.lblSection.BackColor = System.Drawing.SystemColors.ButtonShadow;
this.lblSection.Location = new System.Drawing.Point(108, 203);
this.lblSection.Location = new System.Drawing.Point(81, 165);
this.lblSection.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblSection.Name = "lblSection";
this.lblSection.Size = new System.Drawing.Size(112, 23);
this.lblSection.Size = new System.Drawing.Size(84, 19);
this.lblSection.TabIndex = 48;
//
// lblProc
//
this.lblProc.BackColor = System.Drawing.SystemColors.ButtonShadow;
this.lblProc.Location = new System.Drawing.Point(108, 179);
this.lblProc.Location = new System.Drawing.Point(81, 145);
this.lblProc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblProc.Name = "lblProc";
this.lblProc.Size = new System.Drawing.Size(112, 23);
this.lblProc.Size = new System.Drawing.Size(84, 19);
this.lblProc.TabIndex = 47;
//
// btnConvert
//
this.btnConvert.BackColor = System.Drawing.SystemColors.Info;
this.btnConvert.Location = new System.Drawing.Point(8, 179);
this.btnConvert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnConvert.Location = new System.Drawing.Point(6, 145);
this.btnConvert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.btnConvert.Name = "btnConvert";
this.btnConvert.Size = new System.Drawing.Size(86, 49);
this.btnConvert.Size = new System.Drawing.Size(64, 40);
this.btnConvert.TabIndex = 46;
this.btnConvert.Text = "[2] Convert Data";
this.toolTip1.SetToolTip(this.btnConvert, "This will convert the data found via your DataPath \r\ndefined in your cfg file \r\n(" +
"the one used with 16-bit VE-PROMS)");
"the one used with 16-bit VE-PROMS)");
this.btnConvert.UseVisualStyleBackColor = false;
this.btnConvert.Click += new System.EventHandler(this.btnConvert_Click);
//
@ -550,10 +571,10 @@ namespace DataLoader
//
this.tv.CheckBoxes = true;
this.tv.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tv.Location = new System.Drawing.Point(0, 2);
this.tv.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tv.Location = new System.Drawing.Point(0, 20);
this.tv.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.tv.Name = "tv";
this.tv.Size = new System.Drawing.Size(886, 226);
this.tv.Size = new System.Drawing.Size(664, 184);
this.tv.TabIndex = 24;
this.tv.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tv_BeforeExpand);
this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect);
@ -563,10 +584,9 @@ namespace DataLoader
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1,
this.tsslError});
this.statusStrip1.Location = new System.Drawing.Point(0, 500);
this.statusStrip1.Location = new System.Drawing.Point(0, 441);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
this.statusStrip1.Size = new System.Drawing.Size(886, 45);
this.statusStrip1.Size = new System.Drawing.Size(664, 45);
this.statusStrip1.TabIndex = 47;
this.statusStrip1.Text = "statusStrip1";
//
@ -587,28 +607,28 @@ namespace DataLoader
this.tsslError.Text = "No Errors";
this.tsslError.TextAlign = System.Drawing.ContentAlignment.TopLeft;
//
// checkBox1
// cbCheckRTF
//
this.checkBox1.AutoSize = true;
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
this.checkBox1.Location = new System.Drawing.Point(716, 95);
this.checkBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(87, 21);
this.checkBox1.TabIndex = 85;
this.checkBox1.Text = "Red PDF";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
this.cbCheckRTF.AutoSize = true;
this.cbCheckRTF.Location = new System.Drawing.Point(6, 231);
this.cbCheckRTF.Margin = new System.Windows.Forms.Padding(2);
this.cbCheckRTF.Name = "cbCheckRTF";
this.cbCheckRTF.Size = new System.Drawing.Size(81, 17);
this.cbCheckRTF.TabIndex = 86;
this.cbCheckRTF.Text = "Check RTF";
this.toolTip1.SetToolTip(this.cbCheckRTF, "This will run through StepRTF.SaveText and will put change bars on all the steps." +
" Should only be run to validate the code that fixes the Transitions.");
this.cbCheckRTF.UseVisualStyleBackColor = true;
this.cbCheckRTF.Visible = false;
//
// frmLoader
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(886, 545);
this.ClientSize = new System.Drawing.Size(664, 486);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.sc);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "frmLoader";
this.Text = "PROMS-2010 Data Loader";
this.Load += new System.EventHandler(this.frmLoader_Load);
@ -670,5 +690,6 @@ namespace DataLoader
private System.Windows.Forms.TextBox tbxBackupFileName;
private System.Windows.Forms.Label lblBackupName;
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.CheckBox cbCheckRTF;
}
}

3
PROMS/DataLoader/frmLoader.cs
View File

@ -495,7 +495,7 @@ namespace DataLoader
StepRTB rtb = new StepRTB();
TransitionFixer myFixer = new TransitionFixer(rtb,_LogFilePath);
myFixer.StatusChanged += new TransitionFixerEvent(myFixer_StatusChanged);
TimeSpan howlong = myFixer.Process();
TimeSpan howlong = myFixer.Process(cbCheckRTF.Checked);
string TransFixTime = string.Format("Fix Transitions completion time: {0:D2}:{1:D2}:{2:D2}.{3}", howlong.Hours, howlong.Minutes, howlong.Seconds, howlong.Milliseconds);
MyError = TransFixTime;
MessageBox.Show(string.Format("{0}\r\n\n({1} Total Seconds)", TransFixTime, howlong.TotalSeconds));
@ -531,6 +531,7 @@ namespace DataLoader
cbFormatsOnly.Visible = _DeveloperMode;
btnConvertSelected.Visible = _DeveloperMode;
cbxOnlyThisSet.Visible = _DeveloperMode;
cbCheckRTF.Visible = _DeveloperMode;
}
}

6
PROMS/DataLoader/frmLoader.resx
View File

@ -120,13 +120,13 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>217, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>217, 17</value>
</metadata>
<metadata name="fbd.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>84, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>217, 17</value>
</metadata>
</root>

7
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -62,9 +62,9 @@ namespace VEPROMS
// multiple events because the print dialog will be displayed for each time the event was added.
_SelectedStepTabPanel.MyStepTabRibbon.PrintRequest -= new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest);
_SelectedStepTabPanel.MyStepTabRibbon.PrintRequest += new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest);
}
}
}
}
public DocVersionInfo SelectedDVI
{
@ -161,7 +161,6 @@ namespace VEPROMS
toolsPanel.Expanded = false;
displayTags.Visible = false;
ribbonControl1.ExpandedChanged += new EventHandler(ribbonControl1_ExpandedChanged);
dlgFindReplace = new FindReplace();
SpellChecker = new VlnSpellCheck();
displaySearch1.PrintRequest += new DisplaySearchEvent(displaySearch1_PrintRequest);
@ -185,11 +184,11 @@ namespace VEPROMS
}
void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args)
{
Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.MyItemInfoList, @"C:\temp\searchresults.pdf");
Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.MyItemInfoList,
Volian.Base.Library.VlnSettings.TemporaryFolder + @"\searchresults.pdf");
if (args.SearchString != null)
myReport.SearchString = args.SearchString;
myReport.Build();
System.Diagnostics.Process.Start(myReport.FileName);
}
bool tv_InsertItemInfo(object sender, vlnTreeItemInfoInsertEventArgs args)
{

18
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -287,13 +287,13 @@ namespace VEPROMS.CSLA.Library
#region ItemInfo
public partial class ItemInfo:IVEDrillDownReadOnly
{
public override bool Equals(object obj)
{
ItemInfo ii = obj as ItemInfo;
if (ii != null)
return ii._ItemID == _ItemID;
return false;
}
//public override bool Equals(object obj)
//{
// ItemInfo ii = obj as ItemInfo;
// if (ii != null)
// return ii._ItemID == _ItemID;
// return false;
//}
public bool IsFirstSubStep
{
@ -1327,8 +1327,8 @@ namespace VEPROMS.CSLA.Library
// if this token is preceeded by another token and followed by a space
// leave the preceeding token the ending space
string retval = Regex.Replace(str, @"(\\[^ \\?\r\n\t]*)" + token + " ", "$1 ");
if (retval != str)
Console.WriteLine("leave the preceeding token the ending space");
//if (retval != str) // Show the token replacement
// Console.WriteLine("Leave the preceeding token the ending space '{0}'\r\n{1}\r\n{2}",token,str,retval);
// otherwise replace the token optionally followed by a space
retval = Regex.Replace(retval, token + " ?", "");
return retval;

2
PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
View File

@ -505,7 +505,7 @@ namespace VEPROMS.CSLA.Library
private static string RhmTab(ItemInfo item)
{
if (item == null) return "";
if (item.ItemID == 2065) Console.WriteLine("here");
//if (item.ItemID == 2065) Console.WriteLine("here");
string sret = "";
switch (item.MyContent.Type / 10000)
{

2
PROMS/Volian.Base.Library/TmpFile.cs
View File

@ -25,7 +25,7 @@ namespace Volian.Base.Library
// only delete pdfs if they are older than an hour - just to be
// safe. During creation of pdf's, separate pdfs are created for
// word sections and imported into the main resulting pdf.
if (fi.LastAccessTime.Ticks > (DateTime.Now.Ticks - TimeSpan.TicksPerHour))
if (fi.LastAccessTime.Ticks < (DateTime.Now.Ticks - TimeSpan.TicksPerHour))
fi.Delete();
}
catch (Exception ex)

12
PROMS/Volian.Base.Library/vlnStackTrace.cs
View File

@ -62,22 +62,26 @@ namespace Volian.Base.Library
}
return sb.ToString();
}
public static void ShowStackLocal(string str, params object[] objects)
{
Console.WriteLine(string.Format(str, objects) + StackToStringLocal(2,10));
}
public static void ShowStackFirstLocal(string str)
{
Console.WriteLine(str + " " + StackToStringLocal(3,0));
Console.WriteLine(str + "\r\n" + StackToStringLocal(3, 0));
}
public static void ShowStackLocal(string str,int start)
{
Console.WriteLine(str + " " + StackToStringLocal(start,1));
Console.WriteLine(str + "\r\n" + StackToStringLocal(start,1));
}
public static void ShowStackLocal(string str,int start, int limit)
{
Console.WriteLine(str + " " + StackToStringLocal(start, limit));
Console.WriteLine(str + "\r\n" + StackToStringLocal(start, limit));
}
private static string StackToStringLocal(int start, int limit)
{
StringBuilder sb = new StringBuilder();
string sep = "Local Method - ";
string sep = "\r\n";
StackTrace st = new StackTrace(true);
StackFrame[] sfs = st.GetFrames();
int count = 0;