Index: BL/Sys/FOP/Verwerker/tmpDev.mac.rou =================================================================== diff -u -r73458 -r73591 --- BL/Sys/FOP/Verwerker/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 73458) +++ BL/Sys/FOP/Verwerker/tmpDev.mac.rou (.../tmpDev.mac.rou) (revision 73591) @@ -758,7 +758,7 @@ Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"Render+File","A","vh_renderAndSaveToFileProcessor") Set sc=$$asqAddParamsRenderTask(SeqItem,Doc,) Do asqAddParamsSaveTaskVP(SeqItem,$LG(lbFileDef,1),$LG(lbFileDef,2)) - Set SeqItem.LogInfo=$G(LogInfo) + Set SeqItem.LogInfo=$$asqGeefLogInfoDocBaseV7()_$G(LogInfo) Quit AddSeqItemRenderAndFile(TSeq,Task,Doc,blnLogInfo) ; SqItem: DocBase // Build SeqItem Render+File @@ -770,7 +770,7 @@ Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"Render+File","A","vh_renderAndSaveToFileProcessor") Set sc=$$asqAddParamsRenderTask(SeqItem,Doc,) Do asqAddParamsSaveTask(SeqItem,Task.ActionFile) - Set SeqItem.LogInfo=$G(LogInfo) + Set SeqItem.LogInfo=$$asqGeefLogInfoDocBaseV7()_$G(LogInfo) Quit AddSeqItemRenderAndPrint(TSeq,Task,Doc,blnLogInfo) ; SqItem: DocBase // Build SeqItem Render+Print @@ -782,7 +782,7 @@ Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"Render+Print","A","vh_renderAndPrintProcessor") Set sc=$$asqAddParamsRenderTask(SeqItem,Doc,) Do asqAddParamsPrintTask(SeqItem,Task.ActionPrint) - Set SeqItem.LogInfo=$G(LogInfo) + Set SeqItem.LogInfo=$$asqGeefLogInfoDocBaseV7()_$G(LogInfo) Quit AddSeqItemRenderAndSaveToPPOD(TSeq,Task,Doc,blnLogInfo,PreProcessCmdLine,AddRenderPNow) ; SqItem: DocBase // Build SeqItem Render+SaveToPPOD @@ -794,7 +794,7 @@ Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"Render+SaveToPPOD","A","vh_renderAndSaveToPostprocoutdataProcessor",.PreProcessCmdLine) Set:($G(AddRenderPNow,1)) sc=$$asqAddParamsRenderTask(SeqItem,Doc,) Do asqAddParamsSaveToPPODTask(SeqItem) - Set SeqItem.LogInfo=$G(LogInfo) + Set SeqItem.LogInfo=$$asqGeefLogInfoDocBaseV7()_$G(LogInfo) Quit AddSeqItemRenderAndMail(TSeq,Task,Doc,blnLogInfo) ; SqItem: DocBase // Build SeqItem Render+Mail @@ -806,7 +806,7 @@ Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"Render+Mail","A","vh_renderAndEmailProcessor") Set sc=$$asqAddParamsRenderTask(SeqItem,Doc,) Do asqAddParamsMailTask(SeqItem,Task.ActionMail) - Set SeqItem.LogInfo=$G(LogInfo) + Set SeqItem.LogInfo=$$asqGeefLogInfoDocBaseV7()_$G(LogInfo) Quit AddSeqItemLoadFilesAndMail(TSeq,Task,lbFileNames,blnLogInfo) ; SqItem: DocBase // Build SeqItem LoadFiles+Mail (via DocBase) @@ -816,7 +816,7 @@ Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"MailFiles","A","vh_LoadAndEmailProcessor") Do asqAddParamsLoadFilesTask(SeqItem,lbFileNames) Do asqAddParamsMailTask(SeqItem,Task.ActionMail) - Set SeqItem.LogInfo=$G(LogInfo) + Set SeqItem.LogInfo=$$asqGeefLogInfoDocBaseV7()_$G(LogInfo) Quit AddSeqItemCacheMailFiles(TSeq,Task,lbFileNames,blnLogInfo) ; SqItem: Cache // Build SeqItem MailFiles (via Cach�) @@ -837,7 +837,7 @@ Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"XslTransform+File","A","vh_XSLTransformAndFileSequenceProcessor") Set sc=$$asqAddParamsTransformXsltTask(SeqItem,Doc,) Do asqAddParamsSaveTask(SeqItem,Task.ActionFile) - Set SeqItem.LogInfo=$G(LogInfo) + Set SeqItem.LogInfo=$$asqGeefLogInfoDocBaseV7()_$G(LogInfo) Quit AddSeqItemDocPrintToPPOD(TSeq,Task,Doc,blnLogInfo) @@ -850,6 +850,7 @@ New SeqItem Set SeqItem=$$asqCreateSeqItemDocBase(TSeq,"MergePPOD","A","vh_mergePollingConsumerSequenceProcessor") Do asqAddParamsMergePPODTask(SeqItem,PPODGroupName) + Set SeqItem.LogInfo = $$asqGeefLogInfoDocBaseV7() Quit AddSeqItemMergePPODviaTask(TSeq,Task,Doc,blnLogInfo) /// Dit is toekomstmuziek ... @@ -943,6 +944,9 @@ /// Objects : emSeqItem DocBase - Fill /*** =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= ***/ +asqGeefLogInfoDocBaseV7() + Quit $$$If($G(%WVActivateDocBaseV7)=1,"Via DocBase01-PRD v7; ","") + asqAddParamsRenderTask(SeqItem,Doc,DocBaseTemplate) #define SourceData $S(SeqItem.DataInType="Stream":SeqItem.DataInStream, 1:SeqItem.DataIn) New blFOPData,lbXsltParams,sc