Changeset 549 for trunk

Timestamp:

07/13/08 17:50:40 (15 years ago)

Author:

ramonb

Message:

job_monarch/overview.php:

• set session for ClusterImage?

job_monarch/libtoga.php:

• filter host from ClusterImage?

job_monarch/js/jobgrid.js:

• added function for selecting host for ClusterImage?

job_monarch/jobstore.php:

• use session

job_monarch/templates/header.tpl:

• set ClusterImage? session and cluster args

job_monarch/image.php:

• set host filter on ClusterImage?

Location:

trunk/web2/addons/job_monarch

Files:

• image.php (modified) (2 diffs)
• jobstore.php (modified) (1 diff)
• js/jobgrid.js (modified) (1 diff)
• libtoga.php (modified) (1 diff)
• overview.php (modified) (1 diff)
• templates/header.tpl (modified) (1 diff)

trunk/web2/addons/job_monarch/image.php

@@ -53 +53 @@
 $httpvars = new HTTPVariables( $HTTP_GET_VARS, $_GET );
 $view = $httpvars->getHttpVar( "view" );
+$host = $httpvars->getHttpVar( "host" );
 $clustername = $httpvars->getClusterName();
 
-//printf("clustername = %s\n", $clustername );
 if( isset($id) && ($id!='')) $filter[id]=$id;
 if( isset($state) && ($state!='')) $filter[state]=$state;
 if( isset($user) && ($user!='')) $filter[user]=$user;
 if( isset($queue) && ($queue!='')) $filter[queue]=$queue;
+if( isset($host) && ($host!='')) $filter[host]=$host;
+//printf("host = %s\n", $filter[host] );
 
 function drawHostImage() {
@@ -127 +129 @@
                                         $ic->setFilter( 'status', $filtervalue);
                                         break;
+                                case "host":
+                                        $ic->setFilter( 'host', $filtervalue);
+                                        break;
                                 default:
                                         break;

trunk/web2/addons/job_monarch/jobstore.php

@@ -42 +42 @@
 $ds             = new DataSource();
 $myxml_data     = &$ds->getData();
+
+session_start();
+unset( $_SESSION["data"] );
+$_SESSION["data"]       = &$myxml_data;
 
 global $jobs;

trunk/web2/addons/job_monarch/js/jobgrid.js

@@ -6 +6 @@
 var myfilters = { };
 var myparams = { };
+var ClusterImageArgs = { };
 
 var filterfields = [ "jid", "queue", "name", "owner" ];
 
+function makeArrayURL( somearr )
+{
+  filter_url = '';
+  filter_sep = '';
+
+  for( filtername in somearr )
+  {
+    filter_url = filter_url + filter_sep + filtername + '=' + somearr[filtername];
+    filter_sep = '&';
+  }
+
+  return filter_url;
+}
+
+
+function isset( somevar )
+{
+  try
+  {
+    if( eval( somevar ) ) { }
+  }
+  catch( err )
+  {
+    return false;
+  }
+  return true;
+}
+
+function inMyArray( arr, someval )
+{
+  for( arval in arr )
+  {
+    if( arval == someval )
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+function inMyArrayValues( arr, someval )
+{
+  for( arkey in arr )
+  {
+    if( arr[arkey] == someval )
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+function inMyArrayKeys( arr, someval )
+{
+  for( arkey in arr )
+  {
+    if( arkey == someval )
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+function joinMyArray( arr1, arr2 )
+{
+  for( arkey in arr2 )
+  {
+    arr1[arkey] = arr2[arkey];
+  }
+
+  return arr1;
+}
+
 function ClusterImageSelectHost( somehost )
 {
- // reload clusterimage with somehost as arg
-}
-
-function isset( somevar )
-{
-  try
-  {
-    if( eval( somevar ) ) { }
-  }
-  catch( err )
-  {
-    return false;
-  }
-  return true;
-}
-
-function inMyArray( arr, someval )
-{
-  for( arval in arr )
-  {
-    if( arval == someval )
-    {
-      return true;
-    }
-  }
+
+  if( !inMyArrayKeys( myfilters, 'host' ) )
+  {
+    myfilters['host'] = somehost;
+  }
+  else
+  {
+    delete myfilters['host'];
+  }
+
+  ClusterImageArgs['view'] = 'big-clusterimage';
+
+  filt_url = makeArrayURL( myfilters );
+  imag_url = makeArrayURL( ClusterImageArgs );
+
+  document.getElementById( 'clusterimage' ).src = './image.php?' + filt_url + '&' + imag_url;
+
   return false;
-}
-
-function inMyArrayValues( arr, someval )
-{
-  for( arkey in arr )
-  {
-    if( arr[arkey] == someval )
-    {
-      return true;
-    }
-  }
-  return false;
-}
-
-function inMyArrayKeys( arr, someval )
-{
-  for( arkey in arr )
-  {
-    if( arkey == someval )
-    {
-      return true;
-    }
-  }
-  return false;
-}
-
-function joinMyArray( arr1, arr2 )
-{
-  for( arkey in arr2 )
-  {
-    arr1[arkey] = arr2[arkey];
-  }
-
-  return arr1;
 }
 

trunk/web2/addons/job_monarch/libtoga.php

@@ -1365 +1365 @@
                                                                         $addhost = 0;
                                                                 }
-                                                                else if( $filtername != 'jobid' )
+                                                                if( $filtername == 'host' && $hostname != $filtervalue )
+                                                                {
+                                                                        $addhost = 0;
+                                                                }
+                                                                if( $filtername != 'jobid' && $filtername != 'host' ) 
                                                                 {
                                                                         if( $jobs[$myjob][$filtername] != $filtervalue )

trunk/web2/addons/job_monarch/overview.php

@@ -76 +76 @@
         $ic->draw();
 
+        $tpl->assign( "session_name", session_name() );
+        $tpl->assign( "session_id", session_id() );
         $tpl->assign( "clusterimage", "./image.php?". session_name() . "=" . session_id() ."&c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
 

trunk/web2/addons/job_monarch/templates/header.tpl

@@ -23 +23 @@
         params = newparams;
     });
-  ClusterImageWindow.html = '<IMG SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
+  ClusterImageArgs['{session_name}'] = '{session_id}';
+  ClusterImageArgs['c'] = '{cluster}';
+  ClusterImageWindow.html = '<IMG ID="clusterimage" SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
   ClusterImageWindow.height = '{clusterimage_height}';
   ClusterImageWindow.width = '{clusterimage_width}';