Changeset 462 for trunk/web/addons

Timestamp:

02/07/08 09:12:07 (15 years ago)

Author:

bastiaans

Message:

overview.php:

• remove domain name adding, this is now handled properly by libtoga

File:

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

trunk/web/addons/job_monarch/overview.php

@@ -641 +641 @@
                                                 $hostnode       = $tempnode;
 
-                                                if( substr( $hostnode, $domain_len ) != $jobs[$jobid][domain] ) 
-                                                {
-                                                        $hostnode = $hostnode. '.'. $jobs[$jobid][domain];
-                                                }
+                                                //if( substr( $hostnode, $domain_len ) != $jobs[$jobid][domain] ) 
+                                                //{
+                                                //      $hostnode = $hostnode. '.'. $jobs[$jobid][domain];
+                                                //}
 
                                                 if( $hostname == $hostnode ) 
@@ -804 +804 @@
                                                 foreach( $jobs[$jobid][nodes] as $mynode ) 
                                                 {
-                                                        $myhost_href    = "./?c=".$clustername."&h=".$mynode.".".$jobs[$jobid][domain];
+                                                        //$myhost_href  = "./?c=".$clustername."&h=".$mynode.".".$jobs[$jobid][domain];
+                                                        $myhost_href    = "./?c=".$clustername."&h=".$mynode;
                                                         $mynodehosts[]  = "<A HREF=\"".$myhost_href."\">".$mynode."</A>";
                                                 }
@@ -977 +978 @@
                         foreach ( $hosts_up as $host ) 
                         {
-                                $domain_len             = 0 - strlen( $domain );
-
-                                if( substr( $host, $domain_len ) != $domain ) 
-                                {
-                                        $host           = $host . '.' . $domain;
-                                }
+                                //$domain_len           = 0 - strlen( $domain );
+
+                                //if( substr( $host, $domain_len ) != $domain ) 
+                                //{
+                                //      $host           = $host . '.' . $domain;
+                                //}
 
                                 $cpus                   = $metrics[$host]["cpu_num"]["VAL"];