Changeset 764 for branches/0.4/web/addons/job_monarch
- Timestamp:
- 03/28/13 12:12:23 (11 years ago)
- Location:
- branches/0.4/web/addons/job_monarch
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/0.4/web/addons/job_monarch/libtoga.php
r759 r764 1394 1394 $this->output = 0; 1395 1395 } 1396 function setJobs($jobs )1397 {1398 $this->jobs = &$jobs;1399 }1400 1396 function getJobs() 1401 1397 { … … 1408 1404 1409 1405 return $this->jobs; 1406 } 1407 function setJobs($jobs) 1408 { 1409 $this->jobs = &$jobs; 1410 1410 } 1411 1411 function getNodes() … … 2043 2043 $clusterimage_map = ""; 2044 2044 2045 foreach( $this->nodes as $hostname => $node ) 2046 { 2047 $node_map = $node->getImagemapArea(); 2048 $clusterimage_map .= $node_map; 2045 $nodes = &$this->getNodes(); 2046 2047 foreach( $nodes as $node ) 2048 { 2049 $node_map = $node->getImagemapArea(); 2050 $clusterimage_map .= $node_map; 2049 2051 } 2050 2052 -
branches/0.4/web/addons/job_monarch/overview.php
r763 r764 45 45 $myxml_data = $ds->getData(); 46 46 47 //print_r( $myxml_data ); 48 47 49 $data_gatherer = new DataGatherer( $clustername ); 48 50 $data_gatherer->parseXML( $myxml_data ); … … 59 61 { 60 62 61 global $tpl_data, $filter, $clustername, $piefilter, $data_gatherer, $myxml_data, $filterorder, $_SESSION; 63 global $tpl_data, $filter, $clustername, $piefilter, $data_gatherer, $myxml_data, $filterorder, $_SESSION, $data_gatherer; 64 global $jobs, $gnodes; 62 65 63 66 $filter_image_url = ""; … … 77 80 $ic = new ClusterImage( $myxml_data, $clustername ); 78 81 79 $ic->setJobs( $ data_gatherer->getJobs());80 $ic->setNodes( $ data_gatherer->getNodes());82 $ic->setJobs( $jobs ); 83 $ic->setNodes( $gnodes ); 81 84 $ic->setBig(); 82 85 $ic->setNoimage(); … … 513 516 global $start, $end, $reports, $gnodes, $default_showhosts; 514 517 global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $COLUMN_NODES, $hostname; 515 global $cluster, $use_fqdn ;518 global $cluster, $use_fqdn, $myxml_data, $data_gatherer; 516 519 517 520 $metricname = $m; -
branches/0.4/web/addons/job_monarch/templates/overview.tpl
r758 r764 141 141 </div> 142 142 <MAP NAME="MONARCH_CLUSTER_BIG"> 143 {if "$nodes_clustermap" == "yes"} 144 {$node_area_map} 145 {/if} 143 {$node_area_map} 146 144 </MAP> 147 145 <BR>
Note: See TracChangeset
for help on using the changeset viewer.