Changeset 404

Timestamp:

07/04/07 22:40:08 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/libtoga.php:

• fixed bug in hostname x,y parsing where x/y min was set incorrectly when either one was not found in the hostname

File:

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

trunk/web/addons/job_monarch/libtoga.php

@@ -1210 +1210 @@
                         foreach( $nodes as $hostname => $node )
                         {
-                                $x      = 0;
-                                $y      = 0;
+                                $x      = null;
+                                $y      = null;
 
                                 if( $x_present && $y_present )
@@ -1228 +1228 @@
                                         if( $n < 2 )
                                         {
+                                                //printf( "removing node %s - x present & y present + <2 x,y matches\n", $hostname );
                                                 unset( $nodes[$hostname] );
                                         }
@@ -1238 +1239 @@
                                         if( $n < 1 )
                                         {
+                                                //printf( "removing node %s - x present & !y present + <1 x match\n", $hostname );
                                                 unset( $nodes[$hostname] );
                                         }
@@ -1249 +1251 @@
                                         if( $n < 1 )
                                         {
+                                                //printf( "removing node %s - y present & !x present + <1 y match\n", $hostname );
                                                 unset( $nodes[$hostname] );
                                         }
@@ -1258 +1261 @@
 
 
-                                if( !$x_min )
+                                //printf( "node %s x_min %s x %s\n", $hostname, $x_min, $x );
+
+                                if( !$x_min && $x != null )
                                 {
                                         $x_min  = $x;
                                 }
-                                else if( $x < $x_min )
+                                else if( $x < $x_min && $x != null )
                                 {
                                         $x_min  = $x;
                                 }
-                                if( !$x_max )
+                                if( !$x_max && $x != null )
                                 {
                                         $x_max  = $x;
                                 }
-                                else if( $x > $x_max )
+                                else if( $x > $x_max && $x != null )
                                 {
                                         $x_max  = $x;
                                 }
-                                if( !$y_min )
+                                if( !$y_min && $y != null )
                                 {
                                         $y_min  = $y;
                                 }
-                                else if( $y < $y_min )
+                                else if( $y < $y_min && $y != null )
                                 {
                                         $y_min  = $y;
                                 }
-                                if( !$y_max )
+                                if( !$y_max && $y != null )
                                 {
                                         $y_max  = $y;
                                 }
-                                else if( $y > $y_max )
+                                else if( $y > $y_max && $y != null )
                                 {
                                         $y_max  = $y;
@@ -1368 +1373 @@
                                 }
                         }
+                        //print_r( $nodes );
 
                         for( $n = $x_min; $n <= $x_max; $n++ )
@@ -1398 +1404 @@
                                                         if ( $nn < 2 )
                                                         {
+                                                                //printf( "skipping node %s - y present & x present + <2 x,y matchs\n", $host);
                                                                 continue;
                                                         }
-                                                        if( ( $rx ) > $n )
+                                                        if( intval( $rx ) > $n )
                                                         {
                                                                 $m      = $y_max + 1;
+                                                                //printf( "skipping node %s - y present & x present + rx %s > n %s\n", $rx, $n);
+                                                                continue;
+                                                        }
+                                                        if( intval( $ry ) > $m )
+                                                        {
+                                                                //printf( "skipping node %s - y present & x present + ry %s > m %s\n", $ry, $m);
                                                                 continue;
                                                         }
@@ -1416 +1429 @@
 
                                                 if( !in_array( $host, $filtered_nodes ) )
+                                                {
+                                                        printf( "setting node %s showinfo to 0 - not found in filtered_nodes", $host);
                                                         $nodes[$cur_node]->setShowinfo( 0 );
+                                                }
 
                                                 $nodes[$cur_node]->setCoords( $x, $y );
@@ -1427 +1443 @@
                                                 else if( $this->isBig() )
                                                         $nodes[$cur_node]->drawBig();
+
+                                                $cur_node++;
                                         }
                                         if( $this->isBig() ) 
@@ -1448 +1466 @@
                                         }
 
-                                        $cur_node++;
                                 }
                         }
@@ -1483 +1500 @@
 
                                                 if( !in_array( $host, $filtered_nodes ) )
+                                                {
                                                         $nodes[$host]->setShowinfo( 0 );
+                                                }
 
                                                 if( $this->isSmall() )