Changeset 200 for trunk/web/addons/toga/libtoga.php

Timestamp:

11/18/05 13:27:35 (17 years ago)

Author:

bastiaans

Message:

toga/libtoga.php:

• bug fixed: improper fqdn compilation caused 'ghost' (non-existant) nodes and incorrect job markings to appear in the cluster image

File:

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

trunk/web/addons/toga/libtoga.php

@@ -514 +514 @@
                         //printf( "Found node %s\n", $hostname );
 
-                        if( !isset( $this->nodes[$hostname] ) )
+                        if( !isset( $nodes[$hostname] ) )
                                 $nodes[$hostname] = new NodeImage( $hostname );
 
@@ -573 +573 @@
                                         foreach( $jobs[$jobid][nodes] as $node ) {
 
-                                                $host = $node.'.'.$jobs[$jobid][domain];
+                                                $domain = $jobs[$jobid][domain];
+                                                $domain_len = 0 - strlen( $domain );
+
+                                                if( substr( $node, $domain_len ) != $domain ) {
+                                                        $host = $node. '.'.$domain;
+                                                } else {
+                                                        $host = $node;
+                                                }
+
+                                                //$host = $node.'.'.$jobs[$jobid][domain];
                                 
-                                                if( !isset( $this->nodes[$host] ) )
+                                                if( !isset( $nodes[$host] ) )
                                                         $my_node = new NodeImage( $host );
                                                 else
-                                                        $my_node = $this->nodes[$host];
+                                                        $my_node = $nodes[$host];
 
                                                 if( !$my_node->hasJob( $jobid ) )
@@ -595 +604 @@
                 //print_r( $nodes );
                 $this->nodes = $nodes;
+                //print_r( $this->nodes );
         }