From 014ec3924f884651e6c38f3e1811ae61278a2e60 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 18 Feb 2016 01:51:54 +0100 Subject: [PATCH] LU logger bug fix. version 2.2.220. --- .../BenchControl/DB/SensusOracle/Database.cs | 10 +++++----- .../Forms/PreviousResultsDlg.cs | 20 ++++++++++++++----- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 3129254a1..d5de77811 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -233,7 +233,7 @@ namespace TBF.BenchControl.DB.SensusOracle #endif WriteResultsToDisk(batch); - WriteLogsToDisk(batch); + WriteLogsToDisk(logger, batch); if (anyError) { @@ -458,7 +458,7 @@ namespace TBF.BenchControl.DB.SensusOracle } - public Retv WriteLogsToDisk(Results.Entities.Batch batch) + public static Retv WriteLogsToDisk(StreamWriter logger, Results.Entities.Batch batch) { #if IPERLST if (logger == null) return Retv.Error; @@ -469,7 +469,7 @@ namespace TBF.BenchControl.DB.SensusOracle Results.Entities.WaterMeterData wmData = wm0.WaterMeterData; - Results.Entities.MeterTestRslt adj = wm0.GetMeterTestRslt(string.Format("Adj")); + Results.Entities.MeterTestRslt adj = wm0.GetMeterTestRslt(string.Format("Adjustment")); Results.Entities.MeterTestRslt q1 = wm0.GetMeterTestRslt(string.Format("Q1")); Results.Entities.MeterTestRslt q2 = wm0.GetMeterTestRslt(string.Format("Q2")); Results.Entities.MeterTestRslt q3 = wm0.GetMeterTestRslt(string.Format("Q3")); @@ -613,7 +613,7 @@ namespace TBF.BenchControl.DB.SensusOracle { Results.Entities.WaterMeter wMtr = batch.WaterMeters[i]; - adj = wMtr.GetMeterTestRslt(string.Format("Adj")); + adj = wMtr.GetMeterTestRslt(string.Format("Adjustment")); q1 = wMtr.GetMeterTestRslt(string.Format("Q1")); q2 = wMtr.GetMeterTestRslt(string.Format("Q2")); q3 = wMtr.GetMeterTestRslt(string.Format("Q3")); @@ -628,7 +628,7 @@ namespace TBF.BenchControl.DB.SensusOracle else { logger.WriteLine("geprüft=1"); - logger.WriteLine(string.Format("Zählernummer={0}", wMtr.SerialNrEx)); + logger.WriteLine(string.Format("Zählernummer=")); logger.WriteLine(string.Format("FertigsNr={0}", wMtr.SerialNr)); logger.WriteLine(string.Format("bestanden=1")); /// 1 logger.WriteLine(string.Format("Prüfflag={0}", wMtr.HydrPruefung)); /// 96 diff --git a/TestBenchFramework/Forms/PreviousResultsDlg.cs b/TestBenchFramework/Forms/PreviousResultsDlg.cs index f87123086..ffd3b6112 100644 --- a/TestBenchFramework/Forms/PreviousResultsDlg.cs +++ b/TestBenchFramework/Forms/PreviousResultsDlg.cs @@ -79,17 +79,27 @@ namespace TBF.Forms if (b.BatchNr == data.BatchNr) { #if IPERLST - OracleConnection conn = (Database.DBCfg.DBUsed == DBUsed.Production) - ? new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;") - : new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;"); + //System.IO.StreamWriter logger; + //string fname = "C:\\TBF\\Logs\\test.log"; + //try { logger = new System.IO.StreamWriter(System.IO.File.Create(fname)); } + //catch + //{ + // logger = null; + // log.ErrorFormat("Was not able to open LU log file {0}", fname); + //} + //Database.WriteLogsToDisk(logger, b); + + OracleConnection conn = (Database.DBCfg.DBUsed == DBUsed.Production) + ? new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;") + : new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;"); if (Database.WriteResultsToDatabase(conn, b) == Retv.OK) { b.RsltsSent = true; /// Result was successfully sent session.SaveOrUpdate(b); /// Update MySQL DB - session.Flush(); + session.Flush(); (sender as PreviousResultCtrl).Sent = true; /// Update UI - Redraw(); + Redraw(); } else { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 38ed04a4a..cf35ffca1 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.2.219.1")] -[assembly: AssemblyFileVersion("2.2.219.1")] +[assembly: AssemblyVersion("2.2.220.1")] +[assembly: AssemblyFileVersion("2.2.220.1")]