Changeset 326 for trunk/web/addons/job_monarch/overview.php

Timestamp:

04/21/07 16:22:47 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/overview.php:

• make our own datasource
• store the XML data in a session for the clusterimage
• assign a image map of clickable nodes for the clusterimage

web/addons/job_monarch/templates/overview.tpl:

• add node_clustermap imagemap block

web/addons/job_monarch/libtoga.php:

• simplify DataSource? constructor
• DataGatherer? no longer creates it's own DataSource? so that global XML data may be used
• assign clustername to NodeImage?'s constructor
• added getImagemapArea to NodeImage?
• added get width/height to NodeImage?
• added setNoimage to ClusterImage? to prevent image output while still processing NodeImage?'s
• added getImagemapArea to ClusterImage? to get entire imagemap
• modified DataGatherer? calls to use supplied DataSource?

web/addons/job_monarch/image.php:

• added retrieval of XML data from session for big ClusterImage?
• changed small ClusterImage? and HostImage? to supply their own DataSource? to DataGatherer?

File:

• trunk/web/addons/job_monarch/overview.php (modified) (4 diffs)

trunk/web/addons/job_monarch/overview.php

@@ -26 +26 @@
 global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED, $COLUMN_NODES, $hostname, $piefilter;
 
+$ds             = new DataSource();
+$myxml_data     = $ds->getData();
+
 $data_gatherer = new DataGatherer( $clustername );
 
@@ -33 +36 @@
         $tpl->assign( "cluster_url", rawurlencode($clustername) );
 
-$data_gatherer->parseXML();
+$data_gatherer->parseXML( $myxml_data );
 
 $heartbeat = $data_gatherer->getHeartbeat();
@@ -41 +44 @@
 
 function setupFilterSettings() {
-        global $tpl, $filter, $clustername, $piefilter;
+        global $tpl, $filter, $clustername, $piefilter, $data_gatherer, $myxml_data;
 
         $filter_image_url = "";
@@ -52 +55 @@
         }
 
-        $tpl->assign( "clusterimage", "./image.php?c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
+        //include( "./ci_test.php" );
+        session_start();
+        //printf("data %s\n", strval( $myxml_data ) );
+        $_SESSION["data"] = &$myxml_data;
+
+        $ic = new ClusterImage( $myxml_data, $clustername );
+        $ic->setBig();
+        $ic->setNoimage();
+        $ic->draw();
+
+        //$tpl->assign( "clusterimage", "./image.php?c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
+        $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
+
+        $tpl->assign( "clusterimage_width", $ic->getWidth() );
+        $tpl->assign( "clusterimage_height", $ic->getHeight() );
+
+        $tpl->newBlock( "node_clustermap" );
+        $tpl->assign( "node_area_map", $ic->getImagemapArea() );
+        $tpl->gotoBlock( "_ROOT" );
+
         $tpl->assign( "f_order", $filterorder );