From 7e69ecd37cfc570a62e71d06195b34a8b5efb558 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sun, 11 Sep 2016 07:59:42 +0000 Subject: [PATCH] Version 3.2.1, Korrektur Excel --- Stundensheet.xlsx | Bin 23372 -> 23398 bytes .../bsmd.ExcelReadService/ExcelReadService.cs | 5 ++++- .../bsmd.ExcelReadService/ExcelReader.cs | 16 +++++++++++++++- nsw/Source/bsmd.ExcelReadService/Util.cs | 6 +++++- nsw/Source/bsmd.ExcelReadService/readme.txt | 5 ++++- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.email/BSMDMail.cs | 14 ++++++++++++-- 8 files changed, 42 insertions(+), 8 deletions(-) diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 3d8b22226235b09ee4b0b7cfe8c520405a52bed6..62556098969b008d9d97e4d391a72b3da71c1852 100644 GIT binary patch delta 11488 zcmY+qWmH{Dur7*AaCdjN1b270g}Xxt1cFc8-CctRcZc8(!QCzB!U=ZS=e}{rdGl9~ z>Z<-~c9*o&L^I@JGi0q4BBG~M$o4Nt2ndEGWkhn|o(yJ#2;`LYT`U`_pPMZ|xD65bhwXx7HliiI^b7-eT_-aSwwUihl?@5aLaOB&@d%Jfb zHSJC^`=*!_8~Vx3{b`!gW&g?cYXo`kU?ev~ll@SkLvLj36$|gLd12iIc4QgcH3;!R zIC2osKUS#A$<$axWlAF4f8|z1^Kw<+u>A)C(M0n1y?N0Z@9eJ^1T6k$z`RMSI(m#lrQabqmNQE)cl7p*XH*JFet?u1}$og|PY_3v|m>Qch;wQ(1M zY^e8DG47e^+3(oNPVN&G7<|q7xsJI9tj6(reGWh*aUfzhFd|K%A&wVIj@pnzK#V3q z5>ZI3IqmZ%`WlEuC8p%J>MxL zVEpt5{1m~3Hn(w7gpT$Vqi;OPlE@V3@e$|}CYibrG43($>FOj!Gk%p&iCc1S(lZtz zA&c+h_uu0i{)Y4wdLmJuSq;J>Wt6%Uoqz$-?p&ZXv6b}Z?(zI;eD6s_rRVkF z@#=MW<#n~Kov`BU@bvN(e7@O~!Zej~4(In!Dq}tW`aU?N*wUJ zrhG9GLEU~xi%qKx;#q3$@zd?!c{vF-S)PGbRM=*oHt3B4Q_GGdR?In)JR@v7m$50=xqc-A3% z>qh)ut?p)V;D*xC*$ItL2xa7@fL=v`AP(EY6a-5L@nrxg+s|Dh5f)j%?ssVLU`I8{ zZw_iE50{Q1PsoHN5`rA_Mb68mJcPS(F@werCmGck*P?7pja zS>1$1X{5F+L7>h`y6EukVOX8jI@8k0rmyJn;O)VP`?E~!gZjc`OMmO29k&&FC!zjK z$>FHGvL}{}MkrS4Vqx<&{3%AtABEMMvrY(AUQ7olG76#MG>f~59JnLHKyf8tdT#xC zIri)vZCj<2D1Vu0@oFx7Ai268|Ba7De2uPHdJ(4_DrUzNUoc`u6(}qYgNr4xq=fs0 z%76W$^;R3^7mT`sO1h@kaYPqey1g7BWRh>$SRdL#EY-4j*9NC7iwJ@I!SG2~Rq%BU z?YJ>;FdPPwN;aMs37EgeqD=*uywE6aIaCkIQ9R|k9?)f3giO^>`p6z$7=7P+2h3Y z&beq)NCV??F}SFfv^|aEhOVPv+yfpgCCY&p-Wzta>KCoeCEU)M5ci&sf!~jPfAG4m zMDn{kYQ>(<>OSLt|Ik~=%MkQ$;X9qiE?q zGkp&e9uat6uh^H4s&~&NxWg=3VUnrjy`cPyZJCj0XLeclcpv{KH*R|biL$1H6yWC4 zJf`Gv>u_QlsG|_)WJX6@F`=|vj^3}`h8UO2@(#t*7rHCi)Q=vA!R6$nOY}=unTguA z70UHgY3e6p^v-n_&TU^VhTWxY#d@%e`MJ4QFL~7iJ8kOb_UCbguG{x{Jx2{^T$ET7 zxN_!R5I)taKRSO@JM4;hGpC?%$1}g_HNb6&GawRUfrNk9^ z6OJ7qi}C$*b|#1rS&QIjD(Op2pKP%;lNXWZ(^g4*$><-ps~!jXdq5FL^^!h*?HPOK z4xz5nTO9dn&sBu?tO6(v(W5BRa2Y3 zv>jN>!-vJdLED5Y?G+6mRHalfY=!)~#&#Ul2=A6AZ>lLM?QLv6(kXAyM9LL6p18Lm zW=N0!9}7TW;#Nm2Nb4SxXbcJIly-n((;YFFs5{E9xg;o?WT?3~xM)>eu`KmY7Sk0M-u)oAnOxp%%fVB5EB zo&V1kQpj#NZ;6ETGnn3axw6;*3a+FB^o*v~*S_$!>o}ncpC=^JmVQu=etZ@O z?R_3@gSRv=kpi5#9*rAcwb@UccEAd!ag@K{Z*hFMgn5mC@te3&^Uy>$RXqQ5{t`)* zPpGSogXKq8&qr6_mZ7=(I?Gi@wA>w=l}df#^y`20e}P*m#s486|Ip{~wqhze-#-H# zcyfKQlvWOEA3mI0*uqAv)i6ayU6$~xpu|Y5_Ol~TWN<8{yv{f zgIas4UAjnP28W&V#O%O3w~;5#e?RQvvE26hj}G6aTOYXk+phITB>3K0f2)8ixuoT^ zR8)7tp=R+Pt%IbUrMVDp;*_!UbXN5r3hNNZhpqD+&VvWRGU89Ws?wjrb8{u8tn@9AHK7Mk7+GO>x^^H+9mB=aV<;ag0(l<#zL!xtj?EEz$+uGoFPN#t(i$xxP_Hmv7X%X2=6+ey&j;u zU9zlNNPQU2%r=0e{^DaATBcXHfvqmpS>ZNL-W0>GWe}A?p@38H=i-lmBvJsA5$^$x z%Lq%TL>6piOEeI{($vQsje)HiPNaFlBI~H%baFJi{KPJ87Qd(+EtkyBWeziq(dz4- zW<5Dn5;i!R7{it{b1V1r!ZC^{J-^>YMo||wM3B56t z8Xo+0ht&zQ-u_DP^N+Mn7;1wxlSVE@7Yzm+nl#t$US1MA9U0(7UPPw4Q<^Q@I&CR- zU%f9qh_eT~_RE1j*8SE{h>G@j_{YyhG!e_&VUdH|%Ix#%eFqL3%lOs5#}0!uc+H#~ zqcJ%wO@i{gOU{^ytQ8VLMff(UCJ*k7(&(WempAOZe%xkWlN+>^-^V$HHoFbuD*ozvRc>!+USl zzm;@An|4*eNvm|0#Ba>n6c=53~gF99`Y$dF~(gmDK>+h`g_Exv4c+LkKz;u4$sfFYDg(u$_=XZt{Lnu}t zWb_|G;Y|74!D6>&E~&gvNwaAI#69KgqZwLS^myB~?bJ?Y8`9}hWWV_mbnj+SpIqx~ zxV_ZQUSIS#A!#M}8!Ge;5uDYa#T$F|bNHI^9KWH}?rQ4>D@rwD#NP#cgE=ZKoQ`I? z52(<>02&wvT&w@6(Z!g0k@=@!MDfd3qgix3x-1Ao)f2{lBiW1mqKdPUp@n>Ic1Qvc z6>oxD)Gj_6G+QCo4IDGo1 zdpq(P&zAR#doQbQo$sa;j;l4;jOU_o&>YF-Y6?e~6X0rfVXCH= z5^&)?GAdU`jJS&!5^J$nAWn=Lh*w1!-4)8*G<-&mCECDrhL~JyJ}{N_u)nz5t4M{NKbg6Pr7dXl*r!)CtwXt#e=IPBs0XICmvh$uEH=_1U>;~e-@ z6m=J6qll_)@*ULCp%(+cGyqlH(F`h9(Zn3#V48RhTHv!DZ7ysWSpC+dz_2CRIslLg zeEP?dW!12iucAW}QbJv~cgW4binkv!tGyo=7C`*&z@uvud7a1g#>r*DMI&

y}zs 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 vfWY|w^*U3lY;4=cjj=H|=F9(kuU>tp>YO^&Gd

  • F2Fp@#RM=Kvu`Y#(^w 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 N8&JX&X#dCme*hF08>0XK 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); + } } }