diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 3d8b2222..62556098 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs b/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs index 0a9ae1d0..b7a2c77e 100644 --- a/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs +++ b/nsw/Source/bsmd.ExcelReadService/ExcelReadService.cs @@ -149,7 +149,10 @@ namespace bsmd.ExcelReadService } if (receiptText.Length > 0) - BSMDMail.SendSystemInfoAsync(receiptSubject, receiptText, null); + { + _log.Debug("sending system info email"); + BSMDMail.SendSystemInfo(receiptSubject, receiptText, mailSender); + } // remove e-Mail diff --git a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs index f7405c2b..086433bc 100644 --- a/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs +++ b/nsw/Source/bsmd.ExcelReadService/ExcelReader.cs @@ -15,6 +15,7 @@ using System.Data; using System.Drawing; using System.Globalization; using System.Linq; +using System.Runtime.InteropServices; namespace bsmd.ExcelReadService { @@ -261,10 +262,23 @@ namespace bsmd.ExcelReadService public void Dispose() { + if(this._portcall != null) + { + _log.Debug("close Worksheet"); + Marshal.ReleaseComObject(this._portcall); + } + if (this._excelWorkbooks != null) - this._excelWorkbooks.Close(); + { + _log.Debug("Close Workbooks"); + Marshal.ReleaseComObject(this._excelWorkbooks); + // this._excelWorkbooks.Close(); + } if (this._excelApp != null) + { + _log.Debug("Quit Excel"); this._excelApp.Quit(); + } } internal DateTime? ReadDate(string lookup) diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs index c0b5e233..af5a0f0e 100644 --- a/nsw/Source/bsmd.ExcelReadService/Util.cs +++ b/nsw/Source/bsmd.ExcelReadService/Util.cs @@ -1022,11 +1022,15 @@ namespace bsmd.ExcelReadService return null; } + // neuen MessageCore erzeugen result = new MessageCore(); - + + result.Incoming = true; + result.HerbergFormGuid = Guid.Empty; result.IMO = imo; result.IsTransit = isTransit; result.ReportStatus = MessageCore.ReportStatusEnum.COMPLETE; + result.BSMDStatusInternal = MessageCore.BSMDStatus.PREPARE; result.Portname = poc; result.ETA = eta; if (result.IMO.Length > 7) diff --git a/nsw/Source/bsmd.ExcelReadService/readme.txt b/nsw/Source/bsmd.ExcelReadService/readme.txt index 101aa537..4b4e047e 100644 --- a/nsw/Source/bsmd.ExcelReadService/readme.txt +++ b/nsw/Source/bsmd.ExcelReadService/readme.txt @@ -13,4 +13,7 @@ Das erste liefert einen 5.7.1 zur Das zweite ist nur Pop aktiviert…. die Server IP lautet 192.168.2.101 -SMTP Port ist Standard, POP3 ist 995 mit SSL \ No newline at end of file +SMTP Port ist Standard, POP3 ist 995 mit SSL + +Unter Windows 2008 Server funktionierte COM Interop zunächst nicht, Lösung hier: +http://stackoverflow.com/questions/4408336/system-runtime-interopservices-comexception-0x800a03ec \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 65d99177..8bbdd73c 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.2.0")] +[assembly: AssemblyInformationalVersion("3.2.1")] [assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 8ee99736..d40e2672 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.0.*")] +[assembly: AssemblyVersion("3.2.1.*")] diff --git a/nsw/Source/bsmd.email/BSMDMail.cs b/nsw/Source/bsmd.email/BSMDMail.cs index 7f1ea3ea..58718355 100644 --- a/nsw/Source/bsmd.email/BSMDMail.cs +++ b/nsw/Source/bsmd.email/BSMDMail.cs @@ -141,8 +141,18 @@ namespace bsmd.email message.To.Add(recipient); MailAddress adminAddress = new MailAddress(Properties.Settings.Default.AdminEmail); message.CC.Add(adminAddress); - - mailer.Send(message); + try + { + mailer.Send(message); + } + catch (SmtpException smtpException) + { + log.ErrorFormat("SMTP error while sending e-mail:{0}", smtpException.Message); + } + catch (Exception ex) + { + log.ErrorFormat("other error while sending e-mail:{0}", ex.Message); + } } }