(1) bug fixes, (2) common iPerlCommunication test result derived from the 1st test (Read configuration), version 1.5.111.

This commit is contained in:
Milan Hanajik
2015-09-11 19:36:37 +02:00
parent e230ce02bf
commit 06c46785f6
7 changed files with 118 additions and 14 deletions
@@ -260,14 +260,32 @@ namespace TBF.BenchControl.DB.SensusOracle
}
writer.WriteLine(string.Empty);
///--------
/// Body
///--------
/// Write text body to a disk file
if (combined)
{
for (int wmNr = 0; wmNr < Program.CompoundWMsCount; wmNr++) WriteCombinedWM(wmNr + 1); /// wmNr is 0-based
}
else
{
for (int wmNr = 0; wmNr < Program.WMsCount; wmNr++) /// wmNr is 0-based
{
if (!unsortedResults[0].Meters[wmNr].Disabled)
{
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, Utils.PartNr(wmNr + 1, combined));
WriteSingleWM(wmNr, wmNr + 1, results);
}
}
}
/// Close the file
writer.Close();
writer = null;
///---------------------------------
/// Write results to the database
///--------------------------------
if (!combined)
{
/// Open the Oracle database
conn.Open();
@@ -277,7 +295,6 @@ namespace TBF.BenchControl.DB.SensusOracle
if (!unsortedResults[0].Meters[wmNr].Disabled)
{
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, Utils.PartNr(wmNr + 1, combined));
WriteSingleWM(wmNr, wmNr + 1, results);
SaveSingleWM2DB(wmNr, results);
}
}
@@ -395,8 +412,8 @@ namespace TBF.BenchControl.DB.SensusOracle
parm9.Value = 4; /// = ANBID Stara Tura
OracleParameter parm10 = new OracleParameter();
parm9.OracleDbType = OracleDbType.Int32;
parm9.Value = dbCfg.Baujahr;
parm10.OracleDbType = OracleDbType.Int32;
parm10.Value = dbCfg.Baujahr;
if (MAX_Pruefindex % 100 == 1)
{
@@ -675,8 +692,6 @@ namespace TBF.BenchControl.DB.SensusOracle
/// <summary>Stop this operation</summary>
public void Stop()
{
if (writer != null) writer.Close();
writer = null;
}
}
}