Index: BL/Sys/FOP/CommonTasks.cls.xml =================================================================== diff -u -r1074 -r2038 --- BL/Sys/FOP/CommonTasks.cls.xml (.../CommonTasks.cls.xml) (revision 1074) +++ BL/Sys/FOP/CommonTasks.cls.xml (.../CommonTasks.cls.xml) (revision 2038) @@ -85,6 +85,25 @@ ]]> + + +File verzenden naar een Ftp-server +Meer info : zie CreateTask...() +Oproepen via : + s sc=##class(BL.Sys.FOP.CommonTasks).SendFileToFtpServer(##class(Sys.FOP.SubTaskFTP).%New()) w sc,! +1 +Action:Sys.FOP.SubTaskFTP,RunMode:%String,Priority:%String +%Status + + + ============================================================================================================================ @@ -167,6 +186,25 @@ ]]> + + +Taak creëren voor het verzenden van een file naar een ftp-server. +Action : Ftp-subTask +1 +Action:Sys.FOP.SubTaskFTP +Sys.FOP.Task + + + ============================================================================================================================ 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) Index: Sys/FOP/Task.cls.xml =================================================================== diff -u -r1835 -r2038 --- Sys/FOP/Task.cls.xml (.../Task.cls.xml) (revision 1835) +++ Sys/FOP/Task.cls.xml (.../Task.cls.xml) (revision 2038) @@ -248,9 +248,9 @@ Set sc=Task.AddActionFtp("TestFtp","\\fop\e$\Temp\Test.pdf","","TestOut.pdf",...) -FtpServer:%String,FromPath:%String,DestDir:%String,DestFName:%String,UserName:%String,PassWord:%String,Port:%Integer,BinaryFtp:%Boolean +FtpServer:%String,FromPath:%String,DestDir:%String,DestFName:%String,UserName:%String,PassWord:%String,Port:%Integer,BinaryFtp:%Boolean,DeleteAfterSend:%Boolean %Status - Index: BL/Flow/Offerte/Doc.cls.xml =================================================================== diff -u -r1892 -r2038 --- BL/Flow/Offerte/Doc.cls.xml (.../Doc.cls.xml) (revision 1892) +++ BL/Flow/Offerte/Doc.cls.xml (.../Doc.cls.xml) (revision 2038) @@ -204,7 +204,8 @@ . Set tmpPassWord="T!neKe" . Set tmpPort="" . Set tmpBinaryFtp="" - Set:($$$ISOK(sc)) sc=Task.AddActionFtp(FtpServer,FtpSrcPath,.DestDir,.DestFName, .tmpUserName, .tmpPassWord, .tmpPort, tmpBinaryFtp) + Set DeleteAfterSend=1 + Set:($$$ISOK(sc)) sc=Task.AddActionFtp(FtpServer,FtpSrcPath,.DestDir,.DestFName, .tmpUserName, .tmpPassWord, .tmpPort, tmpBinaryFtp, DeleteAfterSend) Quit:($$$ISERR(sc)) sc Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine) ; $$$rmSync Quit sc Index: BL/Sys/FOP/Data.cls.xml =================================================================== diff -u -r1074 -r2038 --- BL/Sys/FOP/Data.cls.xml (.../Data.cls.xml) (revision 1074) +++ BL/Sys/FOP/Data.cls.xml (.../Data.cls.xml) (revision 2038) @@ -185,21 +185,13 @@ - -Set sc=..TaskAddActionFile(Task,"TestSample_"_$P($H,",",2),"E:\FOP\PDFTemp") + ) ]]> 1 -Task:Sys.FOP.Task,FtpServer:%String,FromPath:%String,DestDir:%String,DestFName:%String,UserName:%String,PassWord:%String,Port:%Integer,BinaryFtp:%Boolean +Task:Sys.FOP.Task,FtpServer:%String,FromPath:%String,DestDir:%String,DestFName:%String,UserName:%String,PassWord:%String,Port:%Integer,BinaryFtp:%Boolean,DeleteAfterSend:%Boolean %Status Index: BL/EC/Data.cls.xml =================================================================== diff -u -r2009 -r2038 --- BL/EC/Data.cls.xml (.../Data.cls.xml) (revision 2009) +++ BL/EC/Data.cls.xml (.../Data.cls.xml) (revision 2038) @@ -2988,74 +2988,89 @@ Set Status=$$$OK ;Invullen bij fout (komt in de logging terecht=INTERNAL MESSAGE, gebruiker ziet deze boodschap NIET) Set InterfaceError="" ;Invullen als een andere boodschap dan de standaard boodschap aan de gebruiker moet getoond worden + /*** *** / + // Tijdelijk aanpassen van de input-parameters om de oproepen van PrijsLijst te kunnen testen (Added by WimV on 08/09/2011) + If Toegang=$$$tgFactuur Do + . Set Toegang=$$$tgPrijsLijst + . Set RecordType=$$$rtCHECK + . Set DocNr="" + Else If Toegang=$$$tgWebShop Do + . Set Toegang=$$$tgPrijsLijst + . Set RecordType=$$$rtPDF ; $$$rtXML ; + . Set DocNr="" + /*** ***/ + ;Factuur If Toegang=$$$tgFactuur Do . Set Status=##class(BL.Flow.Factuur.Doc).ValidateFactNr("F",DocNr,KlantNr) . Quit:($$$ISERR(Status)) . If RecordType=$$$rtPDF Do - .. Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"FAC"_DocNr_".pdf" - .. Set Status=##class(BL.Flow.Factuur.Doc).RenderAndFtpDoc(DocNr,,,$$$vHisieDownloadIntern,,FileName) - .. Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName + . . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"FAC"_DocNr_".pdf" + . . Set Status=##class(BL.Flow.Factuur.Doc).RenderAndFtpDoc(DocNr,,,$$$vHisieDownloadIntern,,FileName) + . . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName ;Order Else If (Toegang=$$$tgOrder) || (Toegang=$$$tgContractOrder) Do . Set Status=##class(BL.Flow.Order.Doc).ValidateORDNr(DocNr,KlantNr) . Quit:($$$ISERR(Status)) . If RecordType=$$$rtPDF Do - .. Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"ORD"_DocNr_".pdf" - .. Set Status=##class(BL.Flow.Order.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) - .. Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName + . . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"ORD"_DocNr_".pdf" + . . Set Status=##class(BL.Flow.Order.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) + . . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName ;Offerte Else If Toegang=$$$tgOfferte Do . Set Status=##class(BL.Flow.Offerte.Doc).ValidateOFFNr(DocNr,KlantNr) . Quit:($$$ISERR(Status)) . If RecordType=$$$rtPDF Do - .. Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"OFF"_DocNr_".pdf" - .. Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc("O-"_DocNr,$$$vHisieDownloadIntern,,FileName) - .. Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName + . . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"OFF"_DocNr_".pdf" + . . Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc("O-"_DocNr,$$$vHisieDownloadIntern,,FileName) + . . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName ;Uitlevering Else If Toegang=$$$tgUitlevering Do . Set Status=##class(BL.Flow.Levering.Doc).ValidateBONNr(DocNr,KlantNr) . Quit:($$$ISERR(Status)) . If RecordType=$$$rtPDF Do - .. Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"LEV"_DocNr_".pdf" - .. Set Status=##class(BL.Flow.Levering.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) - .. Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName + . . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"LEV"_DocNr_".pdf" + . . Set Status=##class(BL.Flow.Levering.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) + . . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName ;Prijslijst Else If Toegang=$$$tgPrijsLijst Do - . If RecordType=$$$rtPDF Do ; converteren van gearchiveerde prijslijst XML naar PDF - .. Set XMLPad=$LG(##class(BL.Flow.PrijsLijst.Doc).ArchiveFullPathUser(KlantNr)) - .. Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"PL.pdf" - .. Set Status=##class(BL.Flow.PrijsLijst.Doc).RenderAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,FileName) - .. Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName - .. Set:($$$ISOK(Status)) DocURL="http://res.vanhoecke.be/cat/vanhoecke/pdf/test.pdf" ; tijdens test - . Else If RecordType=$$$rtXML Do ; converteren van gearchiveerde prijslijst XML naar XML voor XLS - .. Set XMLPad=$LG(##class(BL.Flow.PrijsLijst.Doc).ArchiveFullPathUser(KlantNr)) - .. Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"PL.xml" - .. Set Status=##class(BL.Flow.PrijsLijst.Doc).TransformToXMLAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,FileName) - .. Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName - .. Set:($$$ISOK(Status)) DocURL="http://res.vanhoecke.be/cat/vanhoecke/pdf/test.xml" ; tijdens test - . Else If RecordType=$$$rtCHECK Do ; alleen controle of gearchiveerde prijslijst XML bestaat - .. Set XMLPad=$LG(##class(BL.Flow.PrijsLijst.Doc).ArchiveFullPathUser(KlantNr)) - .. ;Set DocURL="NO DOC" - .. Set:$L(XMLPad) DocURL="HAS DOC" + . If RecordType=$$$rtPDF Do + . . // Converteren van gearchiveerde prijslijst XML naar PDF + . . Set XMLPad=..GeefXMLPadVoorActuelePrijslijst(KlantNr) + . . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"PL.pdf" + . . Set Status=##class(BL.Flow.PrijsLijst.Doc).RenderAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,,FileName) + . . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName + . . ;Set:($$$ISOK(Status)) DocURL="http://res.vanhoecke.be/cat/vanhoecke/pdf/test.pdf" ; tijdens test + . Else If RecordType=$$$rtXML Do + . . // Converteren van gearchiveerde prijslijst XML naar XML voor XLS + . . Set XMLPad=..GeefXMLPadVoorActuelePrijslijst(KlantNr) + . . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"PL.xml" + . . Set Status=##class(BL.Flow.PrijsLijst.Doc).TransformToXMLAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,,FileName) + . . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName + . . ;Set:($$$ISOK(Status)) DocURL="http://res.vanhoecke.be/cat/vanhoecke/pdf/test.xml" ; tijdens test + . Else If RecordType=$$$rtCHECK Do + . . // Alleen controleren of er een gearchiveerde prijslijst XML bestaat + . . Set XMLPad=..GeefXMLPadVoorActuelePrijslijst(KlantNr) + . . Set KlantHeeftPrijslijst=($L(XMLPad)) && (KlantNr'=1000) ; Klant 1000 als test : geen prijslijst + . . Set DocURL=$S(KlantHeeftPrijslijst:"HAS DOC", 1:"NO DOC") ;Webshop Else If Toegang=$$$tgWebShop Do . $$$blFlowOfferte . Set:'DocNr DocNr=%ECSession.PrevWebShopID ; onthouden omdat de flex app na goedvoor order geen WebShopId meer heeft . Set objOfferte=%blFlowOfferte.Open(DocNr) . If '$IsObject(objOfferte) Do Quit - .. Set Status=$$$ERROR($$$GeneralError,"Offerte hoofding '"_DocNr_"' kan niet geopend worden.") + . . Set Status=$$$ERROR($$$GeneralError,"Offerte hoofding '"_DocNr_"' kan niet geopend worden.") . Set Status=##class(BL.Flow.Offerte.Doc).ValidateFlowOfferte(objOfferte,KlantNr) . Quit:($$$ISERR(Status)) . If %blFlowOfferte.IsVervallen() Do Quit - .. Set InterfaceError=$$$Translate($$$errOfferteIsOngeldig) - .. Set Status=$$$ERROR($$$GeneralError,"Offerte vervallen") + . . Set InterfaceError=$$$Translate($$$errOfferteIsOngeldig) + . . Set Status=$$$ERROR($$$GeneralError,"Offerte vervallen") . If objOfferte.Controle="P" Do Quit - .. Set Status=$$$ERROR($$$GeneralError,"Er zijn fouten opgetreden tijdens controle van offerte '"_DocNr_"' ("_objOfferte.Commentaar_").") + . . Set Status=$$$ERROR($$$GeneralError,"Er zijn fouten opgetreden tijdens controle van offerte '"_DocNr_"' ("_objOfferte.Commentaar_").") . If RecordType=$$$rtPDF Do - .. Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"F"_DocNr_".pdf" - .. Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) - .. Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName + . . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"F"_DocNr_".pdf" + . . Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) + . . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName Else Do . Set Status=$$$ERROR($$$GeneralError,"Toegang '"_Toegang_"' is onbekend") @@ -3083,6 +3098,22 @@ ]]> + +1 +KlantNr:%String +%String + + + 1 OrgalRef:%String,EdiNummer:%String,VHisieVwCust:%String Index: BL/Flow/PrijsLijst/Doc.cls.xml =================================================================== diff -u -r2009 -r2038 --- BL/Flow/PrijsLijst/Doc.cls.xml (.../Doc.cls.xml) (revision 2009) +++ BL/Flow/PrijsLijst/Doc.cls.xml (.../Doc.cls.xml) (revision 2038) @@ -285,16 +285,76 @@ + +De volledige Prijslijst-xml omzetten naar de "XML-voor-Excel" versie en deze via ftp naar de www verzenden +XmlPath t.o.v. FOP-server definiëren +Deze call maakt 2 afzonderlijke opdrachten : +nl. eerst een XSLTransform (via WS rechtstreeks naar DocBase) en daarna de Ftp-send (is caché-task via de FOP-scheduler) + + s sc=##class(BL.Flow.PrijsLijst.Doc).TransformToXMLAndFtpFromXML("\\Notes01\Archive\PrijsLijst\PrijsLijst_1239_20081001.xml","testftp",,"TestWimV.xml") w sc,!,$G(fp),! 1 -XmlPath:%String,FtpPath:%String,FileName:%String -XmlPath:%String,FtpServer:%String,DestDir:%String,DestFName:%String +%Status + - + + +Deze call maakt 1 FOP-scheduler opdracht, die de volledige Prijslijst-xml omzet naar PDF-versie en deze via ftp naar de www verzendt +XmlPath t.o.v. FOP-server definiëren 1 -XmlPath:%String,FtpPath:%String,FileName:%String -XmlPath:%String,FtpServer:%String,DestDir:%String,DestFName:%String +%Status + tevens ook wachten tot de task afgehandeld is) + Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine) + Quit sc ]]> Index: BL/Sys/FOP/TaskMgr.cls.xml =================================================================== diff -u -r1074 -r2038 --- BL/Sys/FOP/TaskMgr.cls.xml (.../TaskMgr.cls.xml) (revision 1074) +++ BL/Sys/FOP/TaskMgr.cls.xml (.../TaskMgr.cls.xml) (revision 2038) @@ -322,7 +322,8 @@ . Set tmpPassWord="T!neKe" . Set tmpPort="" . Set tmpBinaryFtp="" - Set:($$$ISOK(sc)) sc=Task.AddActionFtp(FtpServer,FtpSrcPath,.DestDir,.DestFName, .tmpUserName, .tmpPassWord, .tmpPort, tmpBinaryFtp) + Set DeleteAfterSend=1 + Set:($$$ISOK(sc)) sc=Task.AddActionFtp(FtpServer,FtpSrcPath,.DestDir,.DestFName, .tmpUserName, .tmpPassWord, .tmpPort, tmpBinaryFtp, DeleteAfterSend) Set ..FopTask=Task Quit sc ]]> Index: BL/Flow/Basis/DocNew.cls.xml =================================================================== diff -u -r1074 -r2038 --- BL/Flow/Basis/DocNew.cls.xml (.../DocNew.cls.xml) (revision 1074) +++ BL/Flow/Basis/DocNew.cls.xml (.../DocNew.cls.xml) (revision 2038) @@ -332,7 +332,8 @@ . Set tmpPassWord="T!neKe" . Set tmpPort="" . Set tmpBinaryFtp="" - Set:($$$ISOK(sc)) sc=Task.AddActionFtp(FtpServer,FtpSrcPath,.DestDir,.DestFName, .tmpUserName, .tmpPassWord, .tmpPort, tmpBinaryFtp) + Set DeleteAfterSend=1 + Set:($$$ISOK(sc)) sc=Task.AddActionFtp(FtpServer,FtpSrcPath,.DestDir,.DestFName, .tmpUserName, .tmpPassWord, .tmpPort, tmpBinaryFtp, DeleteAfterSend) Set ..FopTask=Task Quit sc ]]> Index: BL/Sys/FOP/WSRequestInfo2.cls.xml =================================================================== diff -u -r1074 -r2038 --- BL/Sys/FOP/WSRequestInfo2.cls.xml (.../WSRequestInfo2.cls.xml) (revision 1074) +++ BL/Sys/FOP/WSRequestInfo2.cls.xml (.../WSRequestInfo2.cls.xml) (revision 2038) @@ -387,11 +387,11 @@ General routine to fill in the DocBase "XsltTransform" task. 1 -ProptList:%ListOfObjects,OutFile:%String +ProptList:%ListOfObjects,XsltStream:%BinaryStream %Status Index: Sys/FOP/SubTaskFTP.cls.xml =================================================================== diff -u -r1835 -r2038 --- Sys/FOP/SubTaskFTP.cls.xml (.../SubTaskFTP.cls.xml) (revision 1835) +++ Sys/FOP/SubTaskFTP.cls.xml (.../SubTaskFTP.cls.xml) (revision 2038) @@ -50,6 +50,31 @@ %Boolean + + +Optioneel; leeg=default +%Boolean + + + +FtpServer:%String,FromPath:%String,DestDir:%String,DestFName:%String,UserName:%String,PassWord:%String,Port:%Integer,BinaryFtp:%Boolean,DeleteAfterSend:%Boolean=0 +1 +1 +%Status + + + %String UserName + +DeleteAfterSend +