Index: BL/Sys/FOP/DocBase.cls.xml =================================================================== diff -u -r48046 -r66155 --- BL/Sys/FOP/DocBase.cls.xml (.../DocBase.cls.xml) (revision 48046) +++ BL/Sys/FOP/DocBase.cls.xml (.../DocBase.cls.xml) (revision 66155) @@ -450,31 +450,38 @@ . Set oLog=##class(Sys.FOP.Logging).AddToLog("INFO","DocBase","RunDocBaseWS","DocBase WS processed successful ~ Item "_$G(%TaskInfo("TSEQ-ITEMID"))_" ~ "_"JobID: "_$G(fopJobID)_"; "_$G(ADBTempLog,"No Log.")) Else Do . Set blnSoapTrapped=($$$StartsWith($$$GETERRORCODE(sc),$$$msgSOAPTRAP)) ; Errorcode begins with $$$msgSOAPTRAP + . Set PrinterNaamBijCannotCancel = $$rdwGeefPrinterNaamBijCannotCancel(sc,$G(%TaskInfo("TASKID"),"???")) . Set msgData=$$rdwGetErrorData() . Set oLog=##class(Sys.FOP.Logging).AddErrorToLog("DocBase","RunDocBaseWS",sc,msgData,0) - . Do rdwSendErrorMail(sc) + . Do rdwSendErrorMail(sc,PrinterNaamBijCannotCancel) . Set sc=$$$ERROR($$$GeneralError,"RunDocBaseWS: Process failed. See log.") Quit sc rdwGetErrorData() Set msg="FOP process failed ." - Set msg=msg_$$$CRLF_"Status: "_$$ParseStatus^vhLib(sc)_$$rdwGeefExtraInfo(sc) + Set msg=msg_$$$CRLF_"Status: "_$$ParseStatus^vhLib(sc)_$$rdwGeefExtraInfo(sc,$G(PrinterNaamBijCannotCancel)) Set:($IsObject(fopReq)) msg=msg_$$$CRLF_"FopRequest "_fopReq.ProcessorBeanID Set:($L($G(%TaskInfo("TSEQID")))) msg=msg_$$$CRLF_"TaskSequence "_%TaskInfo("TSEQID")_" - Task "_$G(%TaskInfo("TASKID")) Set msg=msg_$$$CRLF_"; "_$G(ADBTempLog,"No Log.")_"; "_$$$CRLF_"Info: see mail" Quit msg -rdwGeefExtraInfo(sc) +rdwGeefExtraInfo(sc,PrinterNaamBijCannotCancel) #dim ExtraInfo As %String = "" + If $$$HasLength(PrinterNaamBijCannotCancel) { + Set ExtraInfo = $$$CRLF_"Printer "_ PrinterNaamBijCannotCancel + } + Quit ExtraInfo +rdwGeefPrinterNaamBijCannotCancel(sc,FopTaskId) + #dim PrinterNaamBijCannotCancel As %String = "" If $$$LCase($TR($$ParseStatus^vhLib(sc)," ",""))["cannotcancelprintjob" { - Set fopTask=##class(Sys.FOP.Task).%OpenId($G(%TaskInfo("TASKID"),"???")) + Set fopTask=##class(Sys.FOP.Task).%OpenId(FopTaskId) If ($IsObject(fopTask)) && ($IsObject(fopTask.ActionPrint)) { - Set ExtraInfo = $$$CRLF_"Printer "_ fopTask.ActionPrint.Printer + Set PrinterNaamBijCannotCancel = fopTask.ActionPrint.Printer } } - Quit ExtraInfo -rdwSendErrorMail(sc) ; Mail versturen van de fout + Quit PrinterNaamBijCannotCancel +rdwSendErrorMail(sc,PrinterNaamBijCannotCancel) ; Mail versturen van de fout ;New From,lbTo,Subj,Body,scMail Set Body=$$rdwErrorMailBody(sc) - Do ##class(Sys.FOP.Logging).GetMailFields(.From,.lbTo,.Subj,"Error DocBaseWS") + Do ##class(Sys.FOP.Logging).GetMailFields(.From,.lbTo,.Subj,"Error DocBaseWS"_$$$IfLength(PrinterNaamBijCannotCancel," ('","')")) Do ##class(vhLib.Logger).%New("").Error("Run DocBaseWS",Body,0) Set scMail=$$SendMiniMailForced^vhLib.Mail(From,lbTo,Subj,Body,,,,,) Quit