Changeset 463 for trunk/web/addons/job_monarch/overview.php
- Timestamp:
- 02/07/08 10:35:47 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/web/addons/job_monarch/overview.php
r462 r463 44 44 $gnodes = $data_gatherer->getNodes(); 45 45 $cpus = $data_gatherer->getCpus(); 46 $use_fqdn = $data_gatherer->getUsingFQDN(); 46 47 47 48 function setupFilterSettings() … … 507 508 global $start, $end, $reports, $gnodes, $default_showhosts; 508 509 global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $COLUMN_NODES, $hostname; 509 global $cluster ;510 global $cluster, $use_fqdn; 510 511 511 512 $metricname = $m; … … 552 553 $view_name_nodes = array(); 553 554 555 // Is the "requested memory" column enabled in the config 556 // 554 557 if( $COLUMN_REQUESTED_MEMORY ) 555 558 { … … 557 560 } 558 561 562 // Is the "nodes hostnames" column enabled in the config 563 // 559 564 if( $COLUMN_NODES ) 560 565 { … … 562 567 } 563 568 569 // Is the "queued time" column enabled in the config 570 // 564 571 if( $COLUMN_QUEUED ) 565 572 { … … 582 589 } 583 590 591 // Running / queued amount jobs graph 592 // 584 593 if( $rjqj_host != null ) 585 594 { … … 641 650 $hostnode = $tempnode; 642 651 643 //if( substr( $hostnode, $domain_len ) != $jobs[$jobid][domain] ) 644 //{ 645 // $hostnode = $hostnode. '.'. $jobs[$jobid][domain]; 646 //} 652 if( $use_fqdn == 1) 653 { 654 if( substr( $hostnode, $domain_len ) != $jobs[$jobid][domain] ) 655 { 656 $hostnode = $hostnode. '.'. $jobs[$jobid][domain]; 657 } 658 } 647 659 648 660 if( $hostname == $hostnode ) … … 804 816 foreach( $jobs[$jobid][nodes] as $mynode ) 805 817 { 806 //$myhost_href = "./?c=".$clustername."&h=".$mynode.".".$jobs[$jobid][domain]; 818 if( $use_fqdn == 1) 819 { 820 $mynode = $mynode.".".$jobs[$jobid][domain]; 821 } 807 822 $myhost_href = "./?c=".$clustername."&h=".$mynode; 808 823 $mynodehosts[] = "<A HREF=\"".$myhost_href."\">".$mynode."</A>"; … … 978 993 foreach ( $hosts_up as $host ) 979 994 { 980 //$domain_len = 0 - strlen( $domain ); 981 982 //if( substr( $host, $domain_len ) != $domain ) 983 //{ 984 // $host = $host . '.' . $domain; 985 //} 995 $domain_len = 0 - strlen( $domain ); 996 997 if( $use_fqdn ) 998 { 999 if( substr( $host, $domain_len ) != $domain ) 1000 { 1001 $host = $host . '.' . $domain; 1002 } 1003 } 986 1004 987 1005 $cpus = $metrics[$host]["cpu_num"]["VAL"]; … … 1007 1025 } 1008 1026 } 1027 1009 1028 switch ( $sort ) 1010 1029 {
Note: See TracChangeset
for help on using the changeset viewer.