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

Timestamp:

04/21/07 16:22:47 (17 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/image.php (modified) (4 diffs)

trunk/web/addons/job_monarch/image.php

@@ -29 +29 @@
 }
 
+function checkSessionData() {
+
+        global $_SESSION;
+
+        session_start();
+
+        if( isset( $_SESSION["data"] ) ) {
+                $myxml_data     = &$_SESSION["data"];
+        } else {
+                $myxml_data     = 0;
+        }
+
+        if( !$myxml_data ) {
+                $ds             = new DataSource();
+                $myxml_data     = $ds->getData();
+
+                print_f( "%s\n", $myxml_data );
+        }
+        return $myxml_data;
+}
+
+
 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
 $view = $httpvars->getHttpVar( "view" );
@@ -41 +63 @@
 function drawHostImage() {
 
-        global $clustername, $hostname;
+        global $clustername, $hostname, $data_gatherer;
 
-        $data_gatherer = new DataGatherer( $clustername );
-        $data_gatherer->parseXML();
+        $ds             = new DataSource();
+        $myxml_data     = $ds->getData();
+
+        $data_gatherer  = new DataGatherer( $clustername );
+
+        $data_gatherer->parseXML( $myxml_data );
 
         if( $data_gatherer->isJobmonRunning() )
@@ -56 +82 @@
 function drawSmallClusterImage() {
 
-        global $clustername;
+        global $clustername, $data_gatherer;
 
-        $data_gatherer = new DataGatherer( $clustername );
-        $data_gatherer->parseXML();
+        $ds             = new DataSource();
+        $myxml_data     = $ds->getData();
+
+        $data_gatherer  = new DataGatherer( $clustername );
+
+        $data_gatherer->parseXML( $myxml_data );
 
         if( $data_gatherer->isJobmonRunning() ) {
-                $ic = new ClusterImage( $clustername );
+                $ic = new ClusterImage( $myxml_data, $clustername );
                 $ic->setSmall();
         } else {
@@ -75 +105 @@
         global $filter, $clustername;
 
-        $ic = new ClusterImage( $clustername );
+        $myxml_data     = checkSessionData();
+
+        $ic = new ClusterImage( $myxml_data, $clustername );
         $ic->setBig();