Changeset 30697

Timestamp:

Feb 19, 2011, 4:11:09 AM (15 years ago)

Author:

bills

Message:

incorporate new version from trunk

File:

• tags/ipp-20110218/pstamp/scripts/psstatus (modified) (2 diffs, 1 prop)

tags/ipp-20110218/pstamp/scripts/psstatus

@@ -44 +44 @@
 
 my $totals_query = "
-SELECT label, count(job_id) AS 'Unfinished Jobs', priority
+SELECT label,
+    count(job_id) AS 'Unfinished Jobs',
+    IFNULL(priority,10000) as priority
 FROM pstampRequest join pstampJob USING(req_id)
-JOIN Label USING(label)
+LEFT JOIN Label USING(label)
 WHERE pstampJob.state ='run' and pstampRequest.state ='run'
 GROUP by label";
@@ -75 +77 @@
         pstampRequest.fault,
         timestamp,
-        priority
-FROM pstampRequest
-JOIN Label USING(label)
+        IFNULL(priority,10000) AS priority
+FROM pstampRequest
+LEFT JOIN Label USING(label)
     WHERE pstampRequest.state = 'run' or pstampRequest.state ='new' 
    --     OR pstampRequest.state = 'run.wait'