Changeset 115

Timestamp:

05/30/05 10:54:38 (18 years ago)

Author:

bastiaans

Message:

toga/conf.php, toga/libtoga.php:

• Will now use a 'J' marking for all nodes with a running job Not depending on number of cpus in use anymore

toga/overview.php:

• Fixed makeTime()

Location:

trunk/web/addons/toga

Files:

• conf.php (modified) (1 diff)
• libtoga.php (modified) (2 diffs)
• overview.php (modified) (2 diffs)

trunk/web/addons/toga/conf.php

@@ -18 +18 @@
 // singlecpu when less than all cpus are in use
 //
-$JOB_NODE_MARKING_ALLCPUS = "J";
-$JOB_NODE_MARKING_SINGLECPU = "j";
+//$JOB_NODE_MARKING_ALLCPUS = "J";
+//$JOB_NODE_MARKING_SINGLECPU = "j";
+$JOB_NODE_MARKING = "J";
 
 // XML Datasource for Toga

trunk/web/addons/toga/libtoga.php

@@ -391 +391 @@
 
                 global $SMALL_CLUSTERIMAGE_NODEWIDTH, $JOB_NODE_MARKING_ALLCPUS, $JOB_NODE_MARKING_SINGLECPU;
+                global $JOB_NODE_MARKING;
 
                 $this->load = $this->determineLoad();
@@ -417 +418 @@
 
                 if( count( $this->jobs ) > 0 )
-
-                        if( $this->tasks < $this->cpus )
-                                $node_mark = $JOB_NODE_MARKING_SINGLECPU;
-
-                        else if( $this->tasks == $this->cpus )
-                                $node_mark = $JOB_NODE_MARKING_ALLCPUS;
+                        $node_mark = $JOB_NODE_MARKING;
+
+                //      if( $this->tasks < $this->cpus )
+                //              $node_mark = $JOB_NODE_MARKING_SINGLECPU;
+
+                //      else if( $this->tasks == $this->cpus )
+                //              $node_mark = $JOB_NODE_MARKING_ALLCPUS;
 
                 if( $node_mark )

trunk/web/addons/toga/overview.php

@@ -33 +33 @@
 
         $days = intval( $time / 86400 );
+        $time = $days ? $time % ($days * 86400) : $time;
+
         if( $days > 0 ) {
-                $time = $time % ($days * 86400);
                 if( $days > 1 )
                         $date_str .= $days . 'days - ';
@@ -40 +41 @@
                         $date_str .= $days . 'day - ';
         }
+
         $hours = intval( $time / 3600 );
+        $time = $hours ? $time % ($hours * 3600) : $time;
+
         if( $hours > 0 ) {
-                $time = $time % ($hours * 3600);
                 $date_str .= $hours . ':';
                 $date_unit = ' hours';
         }
+                
         $minutes = intval( $time / 60 );
+        $seconds = $minutes ? $time % ($minutes * 60) : $time;
+
         if( $minutes > 0 ) {
-                $seconds = $time % ($minutes * 60);
-                $date_str .= $minutes . ':';
+
+                if( $minutes >= 10 )
+                        $date_str .= $minutes . ':';
+                else
+                        $date_str .= '0' . $minutes . ':';
+
                 $date_unit = (!isset($date_unit)) ? 'minutes' : $date_unit;
-        }
+        } else if( $days > 0 or $hours > 0 ) {
+                $date_str .= '00:';
+                $date_unit = (!isset($date_unit)) ? 'minutes' : $date_unit;
+        }
+
         $date_unit = (!isset($date_unit)) ? 'seconds' : $date_unit;
-        $date_str .= $seconds . ' ' . $date_unit;
+
+        if( $seconds > 0 ) {
+
+                if( $seconds >= 10 )
+                        $date_str .= $seconds . ' ' . $date_unit;
+                else
+                        $date_str .= '0' . $seconds . ' ' . $date_unit;
+                        
+        } else if ( $days > 0 or $hours > 0 or $minutes > 0 )
+                $date_str .= '00 ' . $date_unit;
 
         return $date_str;