Changeset 653 for branches/0.3/web/addons/job_monarch

Timestamp:

02/04/10 14:09:07 (13 years ago)

Author:

ramonb

Message:

• more PHP4 fixes

Location:

branches/0.3/web/addons/job_monarch

Files:

• libtoga.php (modified) (1 diff)
• overview.php (modified) (4 diffs)

branches/0.3/web/addons/job_monarch/libtoga.php

@@ -587 +587 @@
         function TorqueXMLHandler( $clustername )
         {
-                $jobs                   = array();
-                $clusters               = array();
+                $this->jobs             = array();
+                $this->clusters         = array();
                 $this->nodes            = array();
-                $heartbeat              = array();
-                $down_nodes             = array();
-                $offline_nodes          = array();
+                $this->heartbeat        = array();
+                $this->down_nodes       = array();
+                $this->offline_nodes    = array();
                 $this->clustername      = $clustername;
                 $this->fqdn             = 1;

branches/0.3/web/addons/job_monarch/overview.php

@@ -632 +632 @@
         foreach( $sorted_jobs as $jobid => $sortdec ) 
         {
-                $report_time    = $jobs[$jobid][reported];
+                $report_time    = $jobs[$jobid]['reported'];
 
                 if( $jobs[$jobid]['status'] == 'R' )
@@ -643 +643 @@
                 }
 
-                $ppn            = (int) $jobs[$jobid]['ppn'] ? $jobs[$jobid]['ppn'] : 1;
+                $ppn            = isset( $jobs[$jobid]['ppn'] ) ? $jobs[$jobid]['ppn'] : 1;
                 $cpus           = $nodes * $ppn;
 
@@ -817 +817 @@
                                 }
 
-                                $ppn                    = (int) $jobs[$jobid]['ppn'] ? $jobs[$jobid]['ppn'] : 1;
+                                $ppn                    = isset( $jobs[$jobid]['ppn'] ) ? $jobs[$jobid]['ppn'] : 1;
                                 $cpus                   = $nodes * $ppn;
 
@@ -1119 +1119 @@
                                         $load_color     = load_color($host_load[$host]);
                                         $graphargs      = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
-                                        $graphargs      .= "z=small&c=$cluster_url&h=$host_url&l=$load_color" . "&v=$val['VAL']&r=job&jr=$jobrange&js=$jobstart";
+                                        $graphargs      .= "z=small&c=$cluster_url&h=$host_url&l=$load_color&v=".$val['VAL']."&r=job&jr=$jobrange&js=$jobstart";
                                         if( $max > 0 ) 
                                         {