Changeset 495 for trunk/web

Timestamp:

02/27/08 16:02:01 (16 years ago)

Author:

bastiaans

Message:

job_monarch/libtoga.php:

• fix to domain detection
• fix to if ( ) missing a )

File:

• trunk/web/addons/job_monarch/libtoga.php (modified) (3 diffs)

trunk/web/addons/job_monarch/libtoga.php

@@ -689 +689 @@
                                 }
 
-                                if( isset( $jobs[$jobid][domain] ) and isset( $jobs[$jobid][nodes] ) ) {
+                                if( isset( $jobs[$jobid][nodes] ) ) {
                         
                                         $nr_nodes = count( $jobs[$jobid][nodes] );
@@ -696 +696 @@
                                         {
 
-                                                if( isset( $jobs[$jobid][domain] )
+                                                if( isset( $jobs[$jobid][domain] ) )
                                                 {
                                                         $domain         = $jobs[$jobid][domain];
@@ -713 +713 @@
                                                 }
 
-                                                foreach( $jobs[$jobid][nodes] as $node ) {
+                                                foreach( $jobs[$jobid][nodes] as $node )
+                                                {
 
                                                         // Only add domain name to the hostname if Ganglia is doing that too
                                                         //
-                                                        if( ( $this->fqdn ) && ( isset( $jobs[$jobid][domain] ) )
+                                                        if( $this->fqdn && isset( $jobs[$jobid][domain] ) )
                                                         {
                                                                 if( substr( $node, $domain_len ) != $domain )