diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs index abbaa860d..7ed98009e 100644 --- a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs +++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs @@ -138,7 +138,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger { try { - WriteLogsToDisk(logger, batch); + anyError = anyError || (WriteLogsToDisk(logger, batch) != Retv.OK); logger.Flush(); logger.Close(); log.WarnFormat("{0} : Batch #{1} written OK", Name, batch.BatchNr); @@ -187,6 +187,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger } if (wm0 == null) { + log.Error("Not a single watermeter in the batch"); return Retv.Error; /// Not a single watermeter in the batch } @@ -194,9 +195,17 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger SensusTestInfo[] testInfos = wm0.CompleteTestInfos as SensusTestInfo[]; if (testInfos == null) { + log.Error("CompleteTestInfos of the first water meter is null"); return Retv.Error; /// No test infos } + log.Warn("Using CompleteTestInfos:"); + foreach (var cti in testInfos) + { + log.WarnFormat(" Test={0} PrfNrDB={1} QBzDB={2} PrfNrOpto={3} QBzOpto={4} PrfNrLog={5} QBzLog={6} Range={7}", + cti.TestName, cti.PruefungsNrDB, cti.QBezeichnungDB, cti.PruefungsNrOpto, + cti.QBezeichnungOpto, cti.PruefungsNrLog, cti.QBezeichnungLog, cti.Range); + } Results.Entities.WaterMeterData wmData = wm0.WaterMeterData; @@ -217,6 +226,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger } else { + log.ErrorFormat("Missing test result for test {0}", testInfos[j].TestName); return Retv.Error; /// Missing test result for one of specified tests } } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 9eab4a0d1..1ad8aff6c 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1196.0")] -[assembly: AssemblyFileVersion("2.18.1196.0")] +[assembly: AssemblyVersion("2.18.1197.0")] +[assembly: AssemblyFileVersion("2.18.1197.0")]