Changeset 534 for trunk/web2/addons/job_monarch/jobstore.php

Timestamp:

07/10/08 14:40:20 (16 years ago)

Author:

ramonb

Message:

job_monarch/jobstore.php:

• times and dates are now pretty and make sense

job_monarch/js/jobgrid.js:

• changed column size

job_monarch/js/mainscript.js:

• removed bogus example

job_monarch/overview.php,
job_monarch/libtoga.php:

• moved time function

File:

• trunk/web2/addons/job_monarch/jobstore.php (modified) (3 diffs)

trunk/web2/addons/job_monarch/jobstore.php

@@ -67 +67 @@
         foreach( $jobs as $jobid => $jobattrs )
         {
-                //$jr           = $jobattrs;
-                $jr['jid']      = strval( $jobid );
-                $jr['status']   = $jobattrs['status'];
-                $jr['owner']    = $jobattrs['owner'];
-                $jr['queue']    = $jobattrs['queue'];
-                $jr['name']     = $jobattrs['name'];
-                $jr['requested_time']   = $jobattrs['requested_time'];
+                if( $reported != $heartbeat )
+                { // Old job: skip
+                        continue;
+                }
+
+                $jr['jid']              = strval( $jobid );
+                $jr['status']           = $jobattrs['status'];
+                $jr['owner']            = $jobattrs['owner'];
+                $jr['queue']            = $jobattrs['queue'];
+                $jr['name']             = $jobattrs['name'];
+                $jr['requested_time']   = makeTime( timeToEpoch( $jobattrs['requested_time'] ) );
 
                 if( $jobattrs[status] == 'R' )
@@ -84 +88 @@
                 }
 
-                unset( $jr['nodes'] );
-                unset( $jr['poll_interval'] );
-                unset( $jr['reported'] );
+                //unset( $jr['nodes'] );
+                //unset( $jr['poll_interval'] );
+                //unset( $jr['reported'] );
 
-                $jr['ppn']      = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 );
-                $jr['cpu']      = strval( $nodes * (int) $ppn );
+                $jr['ppn']              = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 );
+                $jr['cpu']              = strval( $nodes * (int) $ppn );
 
 
@@ -96 +100 @@
                         $jr['nodes']    = implode( ",", $jobattrs['nodes'] );
                 }
-                $jr['queued_timestamp'] = $jobattrs['queued_timestamp'];
-                $jr['start_timestamp']  = ($jobattrs['start_timestamp'] ? $jobattrs['start_timestamp'] : "");
 
-                $jobresults[]   = $jr;
+                $jr['queued_timestamp'] = makeDate( $jobattrs['queued_timestamp'] );
+                $jr['start_timestamp']  = ($jobattrs['start_timestamp'] ? makeDate( $jobattrs['start_timestamp'] ) : "");
+
+                $jobresults[]           = $jr;
         }