dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.3.17+18

Browse Source 
kleine Fehler in MDH etc behoben
This commit is contained in:
Daniel Schick 2016-10-31 07:49:16 +00:00
parent c9175416da
commit ae98ea27fb
5 changed files with 83 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

2
nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
View File

@ -405,7 +405,7 @@ namespace bsmd.ExcelReadService
return date; return date;
} }
if (result == null) if ((result == null) && (val != null))
{ {
CultureInfo provider = CultureInfo.InvariantCulture; CultureInfo provider = CultureInfo.InvariantCulture;
string dateString = val.ToString(); string dateString = val.ToString();

12
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -539,6 +539,8 @@ namespace bsmd.ExcelReadService
string kuerzelErsteZelle = reader.ReadText("MDH.PortOfCallLast30DaysLocode_1"); string kuerzelErsteZelle = reader.ReadText("MDH.PortOfCallLast30DaysLocode_1");
try
{
// lt. Mail von Christin am 11.10.2016 // lt. Mail von Christin am 11.10.2016
// "SEC" Mode, die Werte aus last10PortFacilitesCalled (SEC) werden übernommen // "SEC" Mode, die Werte aus last10PortFacilitesCalled (SEC) werden übernommen
@ -595,7 +597,7 @@ namespace bsmd.ExcelReadService
if (poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false) if (poc30d.PortOfCallLast30DaysCrewMembersJoined ?? false)
{ {
string crewNameString = reader.ReadText(crewName); string crewNameString = reader.ReadText(crewName);
if (!crewName.IsNullOrEmpty()) if (!crewNameString.IsNullOrEmpty())
{ {
// try different separators // try different separators
string[] crew = crewNameString.Split(';'); string[] crew = crewNameString.Split(';');
@ -624,6 +626,12 @@ namespace bsmd.ExcelReadService
} }
} }
}
catch(Exception ex)
{
_log.ErrorFormat("Crash during reading of MDH message: {0}", ex);
}
// wird nicht wieder entfernt falls keine Daten vorliegen // wird nicht wieder entfernt falls keine Daten vorliegen
} }
@ -698,7 +706,7 @@ namespace bsmd.ExcelReadService
l10fc.PortFacilityPortLoCode = reader.ReadTextNoWhitespace(portLocode); l10fc.PortFacilityPortLoCode = reader.ReadTextNoWhitespace(portLocode);
l10fc.PortFacilityDateOfArrival = reader.ReadDate(portDateOfArrival); l10fc.PortFacilityDateOfArrival = reader.ReadDate(portDateOfArrival);
l10fc.PortFacilityDateOfDeparture = reader.ReadDate(portDateOfDeparture); l10fc.PortFacilityDateOfDeparture = reader.ReadDate(portDateOfDeparture);
l10fc.PortFacilityShipSecurityLevel = (byte) reader.ReadNumber(portShipSecLevel); l10fc.PortFacilityShipSecurityLevel = (byte?) reader.ReadNumber(portShipSecLevel);
l10fc.PortFacilityGISISCode = reader.ReadTextNoWhitespace(portGISISCode); l10fc.PortFacilityGISISCode = reader.ReadTextNoWhitespace(portGISISCode);
if (l10fc.PortFacilityGISISCode.IsNullOrEmpty() || l10fc.PortFacilityGISISCode == "0") if (l10fc.PortFacilityGISISCode.IsNullOrEmpty() || l10fc.PortFacilityGISISCode == "0")
l10fc.PortFacilityGISISCode = "0000"; l10fc.PortFacilityGISISCode = "0000";

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("3.2.15")] [assembly: AssemblyInformationalVersion("3.2.18")]
[assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.15.*")] [assembly: AssemblyVersion("3.2.18.*")]