Index: BL/Sys/FOP/Verwerker/tmpDev.mac.rou =================================================================== diff -u -r936 -r2038 --- BL/Sys/FOP/Verwerker/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 936) +++ BL/Sys/FOP/Verwerker/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 2038) @@ -40,7 +40,10 @@ . . Do PrintPDF . Else If FopTask.AnalyseRoutine["SendFaxPDF" Do . . Do SendFaxPDF - . Else If FopTask.AnalyseRoutine["DocTransformXslt" Do + . Else If FopTask.AnalyseRoutine["SendFileToFtp" Do + . . Do SendToFtpServer + . + . Else If FopTask.AnalyseRoutine["DocTransformXslt" Do ; Is nog niet afgewerkt : AddParams voor TransformXsltTask ontbreekt nog (Task.ActionFtp nodig) . . Do DocTransformXslt . Else If FopTask.AnalyseRoutine["???" Do . . Do ; ... @@ -474,6 +477,30 @@ /*** =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= ***/ + /// Algemeen bestand : Send via Ftp: +SendToFtpServer + Set sc=$$SendToFtpServerSub() + Quit +SendToFtpServerSub() + // Twee mogelijke implementaties : + // 1. te verzenden bestand opvragen via Task.ActionFtp.FromPath + // 2. te verzenden bestand(en) opvragen via Task.Docs (ListOfObjects) --> kan meerdere files verzenden) + // Momenteel is enkel deel 1 aanwezig + // + New Task,TSeq,CntDocMain,sc + Set Task=FopTask + Set sc=$$$OK + Set TSeq=##class(BL.Sys.FOP.Data).NewTaskSequence(Task) + Set arTaskSeq(0,"OBJTSeq")=TSeq ; TSeq is passed by this array to the calling method BuildTaskSequence() from class BL.Sys.FOP.Verwerker + Set FtpSrcPath=Task.ActionFtp.FromPath + Do AddSeqItemFtpSendFile(TSeq,Task,0) + If Task.ActionFtp.DeleteAfterSend { + Do AddSeqItemDeleteFiles(TSeq,FtpSrcPath,0) + } + Quit sc + + /*** =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= ***/ + /// Render Docs from DocMulti - Save to files to TempDir - Create mail (fields+body) from pxVoorblad - Attach rendered files - remove files after SendMiniMail DocMultiRenderAndMail Set sc=$$DocMultiRenderAndMailSub() @@ -576,7 +603,7 @@ Set arTaskSeq(0,"OBJTSeq")=TSeq ; TSeq is passed by this array to the calling method BuildTaskSequence() from class BL.Sys.FOP.Verwerker Do AddSeqItemRenderAndMail(TSeq,Task,,0) Quit sc - + /// Algemeen Document : Render and Ftp: DocRenderAndFtp Set sc=$$DocRenderAndFtpSub() @@ -594,7 +621,9 @@ Do AddSeqItemRenderAndFile(TSeq,Task,,0) Set FtpSrcPath=Task.ActionFtp.FromPath Do AddSeqItemFtpSendFile(TSeq,Task,0) - Do AddSeqItemDeleteFiles(TSeq,FtpSrcPath,0) + If Task.ActionFtp.DeleteAfterSend { + Do AddSeqItemDeleteFiles(TSeq,FtpSrcPath,0) + } Quit sc /// Algemeen Document : Render and SaveToPPOD: @@ -849,6 +878,8 @@ New sc ;Set sc=SeqItem.FetchDataFromDoc(Doc) ; Sets DataInType en DataIn (String or Stream) ;Do ##class(BL.Sys.FOP.WSRequestInfo2).AddSeedDataRenderDataIn(SeqItem.ProptList,SeqItem.DataInType,$$$SourceData,) + ; of + ;Do ##class(BL.Sys.FOP.WSRequestInfo2).AddSeedDataLoadTask(SeqItem.ProptList, $LB(inXML)) Quit sc asqAddParamsSaveTask(SeqItem,Action)