Changeset 30517 for trunk/pstamp/scripts/psstatus

Timestamp:

Feb 8, 2011, 10:13:15 AM (15 years ago)

Author:

bills

Message:

add totals by label to the Unfinished Jobs section of the status page

File:

• trunk/pstamp/scripts/psstatus (modified) (7 diffs)

trunk/pstamp/scripts/psstatus

@@ -13 +13 @@
 my $running;
 my $finished;
-my $req_faulted;
-my $job_faulted;
+my $finishing;
+my $totals;
 my $dbname;
 my $dbserver;
@@ -20 +20 @@
 my $dbpassword;
 my $verbose;
-my $finishing;
 
 GetOptions(
@@ -26 +25 @@
     'finished|f',    \$finished,
     'finishing',     \$finishing,
-    'req_faulted',   \$req_faulted,
-    'job_faulted',   \$job_faulted,
+    'totals|t',      \$totals,
     'limit|l=i',     \$limit,
     'dbname=s',      \$dbname,
@@ -35 +33 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV ;
 
-$running = 1 if (!$finished and !$finishing and !$running);
-
-my $no_args = ! (defined $running or defined $finished or defined $req_faulted or defined $job_faulted );
+$running = 1 if (!$finished and !$finishing and !$running and !$totals);
+
+my $no_args = ! (defined $running or defined $finished or defined $finishing or defined $totals );
 
 die "cannot supply --running and --finished\n" if ($running and $finished);
@@ -44 +42 @@
 my $ipprc =  PS::IPP::Config->new();
 my $dbh = getDBHandle();
+
+my $totals_query = "
+SELECT label, count(job_id) AS 'Unfinished Jobs', priority
+FROM pstampRequest join pstampJob USING(req_id)
+JOIN Label USING(label)
+WHERE pstampJob.state ='run' and pstampRequest.state ='run'
+GROUP by label";
 
 my $running_query = "
@@ -51 +56 @@
     label,
     reqType,
-    priority,
+   -- priority,
     state,
     fault,
@@ -233 +238 @@
 
 my $sql;
-if ($finished) {
+if ($totals) {
+    $sql = $totals_query;
+} elsif ($finished) {
     $sql = $finished_query;
 } elsif ($running) {