Index: /trunk/klask
===================================================================
--- /trunk/klask (revision 248)
+++ /trunk/klask (revision 249)
@@ -7,5 +7,5 @@
use strict;
use warnings;
-use version; our $VERSION = qv('0.6.3');
+use version; our $VERSION = qv('0.6.4');
use Readonly;
@@ -1483,8 +1483,11 @@
$vlan = $computerdb->{$ip}{network}.' ('.get_current_vlan_id($computerdb->{$ip}{network}).')' if $computerdb->{$ip}{network};
+ my $switch_port_hr = $computerdb->{$ip}{switch_port_hr} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence
+ $switch_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence
+
print <<"END_HTML";
$switch_hostname |
- $computerdb->{$ip}{switch_port_hr} |
+ $switch_port_hr |
$arrow |
$computerdb->{$ip}{hostname_fq} |
@@ -1529,9 +1532,15 @@
my ( $host_short ) = sprintf '%s %3s' , split(m/ \. /xms, $db_switch_parent{$sw}->{'switch'}, 1), $db_switch_parent{$sw}->{port_hr};
+ my $switch_port_hr = $db_switch_output_port{$sw} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence
+ $switch_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence
+
+ my $switch_connected_port_hr = $db_switch_parent{$sw}->{port_hr} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence
+ $switch_connected_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence
+
print <<"END_HTML";
$sw |
- $db_switch_output_port{$sw} |
- $arrow | $db_switch_parent{$sw}->{port_hr} |
+ $switch_port_hr |
+ $arrow | $switch_connected_port_hr |
$db_switch_parent{$sw}->{'switch'} |
$ipv4_address |
@@ -1543,8 +1552,11 @@
}
else {
+ my $switch_port_hr = $db_switch_output_port{$sw} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence
+ $switch_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence
+
print <<"END_HTML";
$sw |
- $db_switch_output_port{$sw} |
+ $switch_port_hr |
$arrow | |
router |