Changeset 563 for trunk/web2/addons/job_monarch/libtoga.php

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

File:

• trunk/web2/addons/job_monarch/libtoga.php (modified) (1 diff)

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;
+                                                                                }
+                                                                        }
+                                                                }
                                                         }
                                                 }