Index: csp/fopqueue.cls.xml
===================================================================
diff -u -r1074 -r1785
--- csp/fopqueue.cls.xml (.../fopqueue.cls.xml) (revision 1074)
+++ csp/fopqueue.cls.xml (.../fopqueue.cls.xml) (revision 1785)
@@ -7,7 +7,20 @@
%VHMacro
cache
%CSP.Page
+0
+
+c:\cache\cache2005v021\csp\admin1\FOPQueue.csp
+
+
+
+/csp/admin1/FOPQueue.csp
+
+
+
+62308,62343
+
+
1
code
@@ -18,7 +31,6 @@
#define QryVal(%v) query.GetDataByName(%v)
New sDomain,sDomFull,sRef
Quit ""
-
]]>
@@ -28,9 +40,7 @@
PrioCode
cache
%String
-
@@ -475,11 +485,11 @@
/*** SQL STATEMENTS ***/
/*** ============== ***/
; SQL-statement for FOP Queue
- Set sqlFOP="SELECT Top 100 ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon "
+ Set sqlFOP="SELECT Top 100 ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords,Task->ActionToString As Action,Task->DocInfo, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon "
Set sqlFOP=sqlFOP_$C(13,10)_" FROM Sys_FOP.TaskQueue WHERE (ID > 1) "
Set sqlFOP=sqlFOP_$C(13,10)_" ORDER BY StatusNum DESC, ID, Priority DESC "
; SQL-statement for FOP QueueArchive
- Set sqlArchive="SELECT ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon "
+ Set sqlArchive="SELECT ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords,Task->ActionToString, Task->DocInfo ,Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon "
Set sqlArchive=sqlArchive_$C(13,10)_" FROM Sys_FOP.QueueArchive "
Set sqlArchive=sqlArchive_$C(13,10)_" WHERE Created BETWEEN '"_##class(Sys.cTimeStamp).LogicalToDisplay(+$H)_"' and '"_##class(Sys.cTimeStamp).LogicalToDisplay(+$H+1)_"'"
Set sqlArchive=sqlArchive_$C(13,10)_" ORDER BY ID DESC"
@@ -524,7 +534,6 @@
Set CspPageTitle="FOP Queue"_$S($G(blnFOPNOW):"", $G(blnFOPCNT):" Count", $G(blnFOPARCHIVE):" Archive", $G(blnFOPLevBon):" LevBons", 1:"")
Set CurMaxBT=..GetMaxBusyTask("")
Quit 1
-
]]>
@@ -539,7 +548,6 @@
Set ^Sys.FOP.Settings("Scheduler","MaxBusyTask")=NewMaxBT
Do:($G(blnTrigger,1)) ##class(BL.Sys.FOP.Scheduler).Trigger()
Quit ""
-
]]>
@@ -552,7 +560,6 @@
@@ -565,20 +572,7 @@
-
-
-c:\cachesys\csp\admin1\FOPQueue.csp
-
-
-
-/csp/admin1/FOPQueue.csp
-
-
-
-62105,37022
-