Changeset 688 for branches/0.3/web

Timestamp:

11/28/12 16:36:05 (11 years ago)

Author:

ramonb

Message:

• more new ganglia-web compatibility fixes

Location:

branches/0.3/web/addons/job_monarch

Files:

• image.php (modified) (2 diffs)
• index.php (modified) (2 diffs)

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

@@ -56 +56 @@
 
 //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($f_id) && ($f_id!='')) $filter[f_id]=$id;
+if( isset($f_state) && ($f_state!='')) $filter[f_state]=$state;
+if( isset($f_user) && ($f_user!='')) $filter[f_user]=$user;
+if( isset($f_queue) && ($f_queue!='')) $filter[f_queue]=$queue;
 
 function drawHostImage() {
@@ -115 +115 @@
                         switch( $filtername ) {
 
-                                case "id":
+                                case "f_id":
                                         $ic->setFilter( 'jobid', $filtervalue );
                                         break;
-                                case "user":
+                                case "f_user":
                                         $ic->setFilter( 'owner', $filtervalue);
                                         break;
-                                case "queue":
+                                case "f_queue":
                                         $ic->setFilter( 'queue', $filtervalue);
                                         break;
-                                case "state":
+                                case "f_state":
                                         $ic->setFilter( 'status', $filtervalue);
                                         break;

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

@@ -58 +58 @@
         $myfilter_fields = explode( ",", $filterorder );
 } else {
-        if( isset($queue) && ($queue!='')) $filter[queue]=$queue;
-        if( isset($state) && ($state!='')) $filter[state]=$state;
-        if( isset($user) && ($user!='')) $filter[user]=$user;
-        if( isset($id) && ($id!='')) $filter[id]=$id;
+        if( isset($f_queue) && ($queue!='')) $filter[f_queue]=$queue;
+        if( isset($f_state) && ($state!='')) $filter[f_state]=$state;
+        if( isset($f_user) && ($user!='')) $filter[f_user]=$user;
+        if( isset($f_id) && ($id!='')) $filter[f_id]=$id;
 }
 
@@ -71 +71 @@
                 switch( $myfilter ) {
 
-                        case "queue":
-                                $filter[queue]=$queue;
+                        case "f_queue":
+                                $filter[f_queue]=$queue;
                                 break;
                         case "state":
-                                $filter[state]=$state;
+                                $filter[f_state]=$state;
                                 break;
                         case "user":
-                                $filter[user]=$user;
+                                $filter[f_user]=$user;
                                 break;
                         case "id":
-                                $filter[id]=$id;
+                                $filter[f_id]=$id;
                                 break;
                 }