diff --git a/PROMS/Baseline/frmBaseline.Designer.cs b/PROMS/Baseline/frmBaseline.Designer.cs index db6ba774..74adce49 100644 --- a/PROMS/Baseline/frmBaseline.Designer.cs +++ b/PROMS/Baseline/frmBaseline.Designer.cs @@ -99,7 +99,6 @@ this.cbUseTruncatedData.Text = "Use Truncated Data"; this.tt.SetToolTip(this.cbUseTruncatedData, "Set the Search to be Case Sensitive\r\nUppercase and Lowercase will not match"); this.cbUseTruncatedData.UseVisualStyleBackColor = true; - this.cbUseTruncatedData.Click += new System.EventHandler(this.cbUseTruncatedData_Click); // // btnUC // diff --git a/PROMS/Baseline/frmBaseline.cs b/PROMS/Baseline/frmBaseline.cs index f323ca6e..92660dc5 100644 --- a/PROMS/Baseline/frmBaseline.cs +++ b/PROMS/Baseline/frmBaseline.cs @@ -73,7 +73,7 @@ namespace Baseline public IgnoreLines MyIgnore { get; set; } = new IgnoreLines(); private LastWas myLast = LastWas.Search; private Settings MySettings; - public bool TruncatedDataFg { get; set; } = false; + //public bool TruncatedDataFg { get; set; } = false; public string MyStatus { get { return tsslStatus.Text; } @@ -203,13 +203,6 @@ namespace Baseline MyIgnore = IgnoreLines.Get(saveOriginal); } } - private void cbUseTruncatedData_Click(object sender, EventArgs e) - { - System.Windows.Forms.CheckBox item = (System.Windows.Forms.CheckBox)sender; - TruncatedDataFg = item.Checked; - - } - //} /// /// Process DebugPagination.txt in all sub-folders /// @@ -972,29 +965,12 @@ namespace Baseline } private void FillByCompare(DirectoryInfo di1, DirectoryInfo di2, string fileName, IgnoreLines myIgnore, bool isTruncatedChecked = false, bool foundFileFg = false) { - //if (isTruncatedChecked) // C2026-041 is the "Use Truncated Data" checked - //{ - // if (!foundFileFg) // flag to indicate if the correct DebugMeta file has been found. - // { - // fileName = getDebubMetaFile(di1, di2, ref foundFileFg); // C2026-041 Check if the DebugMeta_Truncate.txt file is found in the baseline bench mark and the new release being tested. - // } - //} - - foreach (DirectoryInfo diChild1 in di1.GetDirectories()) + foreach (DirectoryInfo diChild1 in di1.GetDirectories()) { DirectoryInfo diChild2 = new DirectoryInfo(Path.Combine(di2.FullName, diChild1.Name)); if (diChild2.Exists) FillByCompare(diChild1, diChild2, fileName,myIgnore, isTruncatedChecked, foundFileFg);// Recursively work on Sub-Folders } - //foreach (FileInfo fiChild1 in di1.GetFiles(fileName)) - //{ - // FileInfo fiChild2 = new FileInfo(Path.Combine(di2.FullName, fiChild1.Name)); - // if (fiChild2.Exists) - // { - // if (CompareFile(fiChild1, fiChild2, myIgnore)) - // Add(new FindFile(fiChild1.FullName, fiChild2.FullName));// Process Each File - // } - //} foreach (FileInfo fiChild1 in di1.GetFiles(fileName)) { FileInfo fiChild2 = new FileInfo(Path.Combine(di2.FullName, fiChild1.Name)); @@ -1027,29 +1003,6 @@ namespace Baseline } } } - private string getDebubMetaFile(DirectoryInfo di1, DirectoryInfo di2, ref bool foundFileFg) // C2026-041 - { - string flnm; - DirectoryInfo dr1 = di1.GetDirectories()[0]; // get first folder for test of which DebugMeta file to use. The DebugMeta files are found only ineach proc set folder. - if (!dr1.Name.Substring(0, 8).Contains("VEPROMS_") && !foundFileFg) - { - if (File.Exists(Path.Combine(dr1.FullName, "DebugMeta_Truncated.txt")) && File.Exists(Path.Combine(di2.FullName, dr1.Name, "DebugMeta_Truncated.txt"))) // if DebugMeta_Truncate.txt file is found. - { - flnm = "DebugMeta_Truncated.txt"; - foundFileFg = true; - } - else - { - flnm = "DebugMeta.txt"; - foundFileFg = true; - } - } - else - { - flnm = "DebugMeta.txt"; - } - return flnm; - } private bool CompareFile(FileInfo fiChild1, FileInfo fiChild2,IgnoreLines myIgnore) { if (fiChild1.Name == "DebugMeta.txt" || fiChild1.Name == "DebugMeta_Truncated.txt")