Index: _csp/admin1/FOPTask.csp =================================================================== diff -u -r757 -r1281 --- _csp/admin1/FOPTask.csp (.../FOPTask.csp) (revision 757) +++ _csp/admin1/FOPTask.csp (.../FOPTask.csp) (revision 1281) @@ -373,7 +373,7 @@ #define CvtNOBR(%v) "(''||"_%v_"||'') "_%v #define CvtNOBRhtml(%v) "('<NOBR>'||"_%v_"||'</NOBR>') "_%v #define StatussesToMove(%v) (%v?1(1$$$qsError,1$$$qsProcessed,1$$$qsFinished)) -#define LogLinesDFL 20 +#define LogLinesDFL 199 /*** INPUT PARAMETERS ***/ /*** ================ ***/ @@ -386,12 +386,14 @@ Set QArchID=$G(%request.Data("QARCH",1)) Set TaskID=$G(%request.Data("TASK",1)) Set LogLines=$G(%request.Data("LOGLINES",1),0) + Set LogLinesDFL=$$$LogLinesDFL ; Calc derived objects and values Set blnQArchive=(QItemID="")&&(QArchID'="") Set QueueID=$S(blnQArchive:QArchID,1:QItemID) Set LogIDShowFirst="" Set QItem="" Set:($L(QueueID)) QItem=$zobjclassmethod($S(blnQArchive:"Sys.FOP.QueueArchive", 1:"Sys.FOP.QueueItem"),"%OpenId",QueueID) + ; Task from Queue-object ? If $IsObject(QItem) Do . Set blnQItemExists=1 @@ -403,14 +405,18 @@ . . Set blnTaskFromQItem=0 . . Set blnTaskConflictIDs=(TaskID'=TaskIDFromQ) . ; Calc LogTimes + . Set DateStarted=$ZD(QItem.Started,1) + . Set TimeStarted=$ZT($P(QItem.Started,",",2),1) + . Set TimeFinished=$ZT($P(QItem.Finished,",",2),1) + . . Set LogIDCreated=##class(Sys.FOP.Logging).NearestLogID(QItem.Created) . Set LogIDStarted=##class(Sys.FOP.Logging).NearestLogID(QItem.Started) . Set LogIDFinished=##class(Sys.FOP.Logging).NearestLogID(QItem.Finished) . Set LogIDShowFirst=$S($L(LogIDStarted):LogIDStarted, $L(LogIDCreated):LogIDCreated, $L(LogIDFinished):LogIDFinished, 1:"") . Set LogIDShowLast=LogIDFinished . If LogIDShowLast="" Do . . Set LogIDShowLast=LogIDShowFirst - . . Set $P(LogIDShowLast,"||",2)=$P(LogIDShowFirst,"||",2)+$G(LogLines,10) + . . Set $P(LogIDShowLast,"||",2)=$P(LogIDShowFirst,"||",2)+LogLines . ; . Set:(blnQArchive) QItemID="("_QItem.QItemID_")" Else Do @@ -433,9 +439,10 @@ Set sqlTask02="SELECT ID1 As TaskID,Status,ActionPrint_Printer AS Print_Printer,ActionFile_DocPath AS File_DocPath,ActionFile_DocName AS File_DocName,ActionFax_FaxNr AS Fax_FaxNr,ActionMail_Aan AS Mail_Aan,ActionMail_Subject AS Mail_Subject,ActionPrint_OMRCode AS PrintGroep FROM Sys_FOP.Task WHERE ID1='"_TaskID_"'" Set sqlTask02b="SELECT element_key As DocKey, Docs_DataRef As DataRef, Docs_DataFetchType As DataFetchType ,Docs_DataDefsLB As DataDefsLB, Docs_DataType As DataType, Docs_TransformTemplate As TFTemplate, Docs_TransformType As TFType, Docs_Taal As Taal, Docs_XSLParameters As XSLT_Params, Task FROM Sys_FOP.Task_Docs WHERE Task='"_TaskID_"'" Set sqlTask03="SELECT TaskSequence, Items_SortNr AS SortNr, Items_OmsID AS OmsID, Items_Status AS Status, Items_Type AS Type, ID, Items_LogInfo AS LogInfo FROM Sys_FOP.TaskSequence_Items WHERE "_$S(1:"TaskSequence->Task = '"_TaskID_"'", 1:"TaskSequence = "_$S(TSeqID="":0,1:TSeqID))_"" - Set sqlTask04="SELECT top "_$G(LogLines,10)_" ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBR("Detail")_" FROM Sys_FOP.Logging WHERE (IDNum >= "_(($P(LogIDShowFirst,"||",1)*1000000)+$P(LogIDShowFirst,"||",2))_")" + ;Set sqlTask04="SELECT top "_$G(LogLines,10)_" ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBR("Detail")_" FROM Sys_FOP.Logging WHERE (IDNum >= "_(($P(LogIDShowFirst,"||",1)*1000000)+$P(LogIDShowFirst,"||",2))_")" ;Set sqlTask04="SELECT top "_$G(LogLines,10)_" ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBR("Detail")_" FROM Sys_FOP.Logging WHERE (ID BETWEEN '"_(LogIDShowFirst)_"' AND '"_(LogIDShowLast)_"' )" - Set:(LogIDShowFirst="") sqlTask04="SELECT ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBR("Detail")_" FROM Sys_FOP.Logging WHERE (0=1)" + Set:(LogIDShowFirst'="") sqlTask04="SELECT top "_LogLines_" ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBR("Detail")_" FROM Sys_FOP.Logging WHERE (Datum='"_DateStarted_"') AND (Tijd between '"_TimeStarted_"' and '"_TimeFinished_"')" + Set:(LogIDShowFirst="" ) sqlTask04="SELECT ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBR("Detail")_" FROM Sys_FOP.Logging WHERE (0=1)" ; SQL-statement for FOP Task via ID (ONLY FOR DISPLAY) Set sqlTask="SELECT ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon " Set sqlTask=sqlTask_$C(13,10)_" FROM Sys_FOP.TaskQueue WHERE ID1=111" @@ -445,8 +452,8 @@ Set sqlTask=sqlTask_$C(13,10)_" FROM Sys_FOP.Task_Docs WHERE Task='999||0'" ; " WHERE Status<>'P' AND Status<>'F' ORDER BY Status, ID" Set sqlTask=sqlTask_$C(13,10)_"SELECT TaskSequence, Items_SortNr AS SortNr, Items_OmsID AS OmsID, Items_Status AS Status, Items_Type AS Type, ID, Items_LogInfo AS LogInfo" Set sqlTask=sqlTask_$C(13,10)_" FROM Sys_FOP.TaskSequence_Items WHERE TaskSequence in (SELECT ID FROM Sys_FOP.TaskSequence WHERE Task = '"_("999||0")_"')" - Set sqlTask=sqlTask_$C(13,10)_"SELECT top 20 ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBRhtml("Detail")_" " - Set sqlTask=sqlTask_$C(13,10)_" FROM Sys_FOP.Logging WHERE (IDNum >= 60789000295)" + Set sqlTask=sqlTask_$C(13,10)_"SELECT top "_LogLines_" ID, Niveau, Datum, Tijd, Groep, Actie, "_$$$CvtNOBRhtml("Detail")_" " + Set sqlTask=sqlTask_$C(13,10)_" FROM Sys_FOP.Logging WHERE (Datum='"_$G(DateStarted,"05/24/2011")_"') AND (Tijd between '"_$G(TimeStarted,"13:25:13")_"' and '"_$G(TimeFinished,"13:25:16")_"')" ; (IDNum >= 60789000295) ; SQL-statement last three IDs Set sqlTOP3="SELECT top 3 ID FROM Sys_FOP.TaskQueue ORDER BY ID Desc" ; SQLs to be displayed Index: Sys/FOP/QueueArchive.cls.xml =================================================================== diff -u -r1074 -r1281 --- Sys/FOP/QueueArchive.cls.xml (.../QueueArchive.cls.xml) (revision 1074) +++ Sys/FOP/QueueArchive.cls.xml (.../QueueArchive.cls.xml) (revision 1281) @@ -19,6 +19,10 @@ QItemID + +Created + + 1 Dagen