Changeset 563 for trunk

Timestamp:

01/22/09 16:33:31 (15 years ago)

Author:

ramonb

Message:

web2/addons/job_monarch/image.php:

• added query search option for node filtering

web2/addons/job_monarch/jobstore.php:

• also search nodes and jobid with query

web2/addons/job_monarch/js/jobgrid.js:

• added load event to datastore to trigger clusterimage reload and include any searchfield query

web2/addons/job_monarch/libtoga.php:

• added query filter for clusterimage node filtering

Location:

trunk/web2/addons/job_monarch

Files:

• image.php (modified) (3 diffs)
• jobstore.php (modified) (1 diff)
• js/jobgrid.js (modified) (5 diffs)
• libtoga.php (modified) (1 diff)

trunk/web2/addons/job_monarch/image.php

@@ -57 +57 @@
 $view = $httpvars->getHttpVar( "view" );
 $host = $httpvars->getHttpVar( "host" );
+$query = $httpvars->getHttpVar( "query" );
 $clustername = $httpvars->getClusterName();
 
@@ -64 +65 @@
 if( isset($queue) && ($queue!='')) $filter[queue]=$queue;
 if( isset($host) && ($host!='')) $filter[host]=$host;
+if( isset($query) && ($query!='')) $filter[query]=$query;
 //printf("host = %s\n", $filter[host] );
 
@@ -135 +137 @@
                                         $ic->setFilter( 'host', $filtervalue);
                                         break;
+                                case "query":
+                                        $ic->setFilter( 'query', $filtervalue);
+                                        break;
                                 default:
                                         break;

trunk/web2/addons/job_monarch/jobstore.php

@@ -110 +110 @@
                         {
                                 $searchresults[$jobid]  = $jobattrs;
+                        }
+                        if( is_array( $jobattrs['nodes'] ) )
+                        {
+                                foreach( $jobattrs['nodes'] as $jattr )
+                                {
+                                        if( strpos( $jattr, $query ) !== false )
+                                        {
+                                                $searchresults[$jobid]  = $jobattrs;
+                                        }
+                                }
+                        }
+                        if( strpos( $jobid, $query ) !== false )
+                        {
+                                $searchresults[$jobid]  = $jobattrs;
                         }
                 }

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

@@ -336 +336 @@
                 method: 'POST'
             });
+
+  var SearchField;
 
   JobsDataStore = new Ext.data.Store({
@@ -361 +363 @@
       ]),
       sortInfo: { field: 'jid', direction: "DESC" },
-      remoteSort: true
+      remoteSort: true,
+      listeners: { 'load': {
+                        scope: this,
+                        fn: function() {
+                                        if( SearchField ) {
+                                                search_value = SearchField.getEl().dom.value;
+
+                                                if( search_value != '' )
+                                                {
+                                                        myfilters['query']      = search_value;
+                                                }
+
+                                                reloadClusterImage();
+
+                                                if( search_value != '' )
+                                                {
+                                                        delete myfilters['query'];
+                                                }
+                                        }
+                                }
+                        }
+                }
     });
    
@@ -467 +490 @@
 
   var win;
+
+  SearchField   = new Ext.app.SearchField({
+                                store: JobsDataStore,
+                                params: {start: 0, limit: mylimit},
+                                width: 200
+                    });
 
   JobListingEditorGrid =  new Ext.grid.EditorGridPanel({
@@ -486 +515 @@
                 plugins: [new Ext.ux.PageSizePlugin()]
             }),
-      tbar: [ new Ext.app.SearchField({
-                                store: JobsDataStore,
-                                params: {start: 0, limit: mylimit},
-                                width: 200
-                    }),
+      tbar: [ SearchField,
                 new Ext.Button({
                                 text: 'Show nodes',
@@ -511 +536 @@
                                         }
                                 }
-                        })
-      ]
+                        }) ]
     });
 

trunk/web2/addons/job_monarch/libtoga.php

@@ -1363 +1363 @@
                                                                         }
                                                                 }
+                                                                if( $filtername == 'query' )
+                                                                {
+                                                                        foreach( $jobs[$myjob] as $myj_attr => $myj_val )
+                                                                        {
+                                                                                if(!is_array( $myj_val ) )
+                                                                                {
+                                                                                        if( strpos( $myj_val, $filtervalue ) !== false )
+                                                                                        {
+                                                                                                $addhost = 1;
+                                                                                                continue;
+                                                                                        }
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                        foreach( $myj_val as $myj_v )
+                                                                                        {
+                                                                                                if( strpos( $myj_v, $filtervalue ) !== false )
+                                                                                                {
+                                                                                                        $addhost = 1;
+                                                                                                        continue;
+                                                                                                }
+                                                                                        }
+                                                                                }
+                                                                                if( strpos( $myjob, $filtervalue ) !== false )
+                                                                                {
+                                                                                        $addhost        = 1;
+                                                                                        continue;
+                                                                                }
+                                                                        }
+                                                                }
                                                         }
                                                 }