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

Timestamp:

02/04/09 13:51:28 (15 years ago)

Author:

ramonb

Message:

job_monarch/libtoga.php:

• fixed clusterimage filtering

job_monarch/image.php:

• code cleanup

File:

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

trunk/web2/addons/job_monarch/libtoga.php

@@ -1402 +1402 @@
                 $filtered_nodes = array();
 
+                $filter_checks  = array();
+
                 foreach( $nodes as $node )
                 {
-                        $hostname = $node->getHostname();
-
-                        $addhost = 1;
-
-                        if( count( $this->filters ) > 0 )
-                        {
-                                $mynjobs = $node->getJobs();
-
-                                if( $filtername == 'host' && $hostname == $filtervalue )
-                                {
-                                        $addhost        = 1;
-                                        $this->selected = $hostname;
-                                }
-                                else if( count( $mynjobs ) > 0 )
-                                {
-                                        foreach( $mynjobs as $myjob )
-                                        {
-                                                foreach( $this->filters as $filtername => $filtervalue )
-                                                {
-                                                        if( $filtername!=null && $filtername!='' )
+                        $hostname       = $node->getHostname();
+                        $mynjobs        = $node->getJobs();
+
+                        foreach( $this->filters as $filtername => $filtervalue )
+                        {
+                                $filter_checks[$filtername] = false;
+                        }
+
+                        if( array_key_exists( 'host', $this->filters ) )
+                        {
+                                if( $hostname == $this->filters['host'] )
+                                {
+                                        $this->selected         = $hostname;
+                                        $filtered_nodes[] = $hostname;
+                                        //$filter_checks['host']        = true;
+                                }
+                        }
+
+                        if( count( $mynjobs ) == 0 )
+                        {
+                                continue;
+                        }
+
+                        foreach( $mynjobs as $myjob )
+                        {
+                                foreach( $this->filters as $filtername => $filtervalue )
+                                {
+                                        if( $filtername == 'jid' )
+                                        {
+                                                if( $myjob == $filtervalue )
+                                                {
+                                                        $filter_checks['jid'] = true;
+                                                }
+                                        }
+                                        if( $filtername == 'query' )
+                                        {
+                                                foreach( $jobs[$myjob] as $myj_attr => $myj_val )
+                                                {
+                                                        if( is_array( $myj_val ) )
                                                         {
-                                                                if( $filtername == 'jobid' )
+                                                                foreach( $myj_val as $myj_v )
                                                                 {
-                                                                        if ( $myjob != $filtervalue )
+                                                                        if( strpos( $myj_v, $filtervalue ) !== false )
                                                                         {
-                                                                                $addhost = 0;
-                                                                                break;
-                                                                        }
-                                                                        else
-                                                                        {
-                                                                                $addhost = 1;
-                                                                                break;
-                                                                        }
-                                                                }
-                                                                else
-                                                                {
-                                                                        if( $jobs[$myjob][$filtername] == $filtervalue )
-                                                                        {
-                                                                                $addhost = 1;
-                                                                                continue;
-                                                                        }
-                                                                        else if( $jobs[$myjob][$filtername] != $filtervalue )
-                                                                        {
-                                                                                $addhost = 0;
-                                                                        }
-                                                                        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;
-                                                                                        }
-                                                                                }
+                                                                                $filter_checks['query'] = true;
                                                                         }
                                                                 }
                                                         }
-                                                }
-                                        }
-                                }
-                                else
-                                {
-                                        $addhost = 0;
-                                }
-                        }
-
-                        if( $addhost )
+                                                        else
+                                                        {
+                                                                if( strpos( $myj_v, $filtervalue ) !== false )
+                                                                {
+                                                                        $filter_checks['query'] = true;
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                        if( $filtername != 'host' )
+                                        {
+                                                if( $jobs[$myjob][$filtername] == $filtervalue )
+                                                {
+                                                        $filter_checks[$filtername] = true;
+                                                }
+                                        }
+                                }
+                        }
+
+                        $addhost        = true;
+
+                        foreach( $filter_checks as $c_filtername => $c_filterfound )
+                        {
+                                if( ! $c_filterfound )
+                                {
+                                        $addhost        = false;
+                                }
+                        }
+
+                        if( $addhost == true )
                         {
                                 $filtered_nodes[] = $hostname;