Changeset 249 for trunk/klask
- Timestamp:
- Sep 8, 2017, 4:30:42 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/klask
r248 r249 7 7 use strict; 8 8 use warnings; 9 use version; our $VERSION = qv('0.6. 3');9 use version; our $VERSION = qv('0.6.4'); 10 10 11 11 use Readonly; … … 1483 1483 $vlan = $computerdb->{$ip}{network}.' ('.get_current_vlan_id($computerdb->{$ip}{network}).')' if $computerdb->{$ip}{network}; 1484 1484 1485 my $switch_port_hr = $computerdb->{$ip}{switch_port_hr} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence 1486 $switch_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence 1487 1485 1488 print <<"END_HTML"; 1486 1489 <tr class="$typerow"> 1487 1490 <td sorttable_customkey="$switch_hostname_sort">$switch_hostname</td> 1488 <td class="bklask-port">$ computerdb->{$ip}{switch_port_hr}</td>1491 <td class="bklask-port">$switch_port_hr</td> 1489 1492 <td colspan="2">$arrow</td> 1490 1493 <td sorttable_customkey="$host_short">$computerdb->{$ip}{hostname_fq}</td> … … 1529 1532 my ( $host_short ) = sprintf '%s %3s' , split(m/ \. /xms, $db_switch_parent{$sw}->{'switch'}, 1), $db_switch_parent{$sw}->{port_hr}; 1530 1533 1534 my $switch_port_hr = $db_switch_output_port{$sw} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence 1535 $switch_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence 1536 1537 my $switch_connected_port_hr = $db_switch_parent{$sw}->{port_hr} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence 1538 $switch_connected_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence 1539 1531 1540 print <<"END_HTML"; 1532 1541 <tr class="$typerow"> 1533 1542 <td sorttable_customkey="$switch_hostname_sort">$sw</td> 1534 <td class="bklask-port">$ db_switch_output_port{$sw}</td>1535 <td>$arrow</td><td>$ db_switch_parent{$sw}->{port_hr}</td>1543 <td class="bklask-port">$switch_port_hr</td> 1544 <td>$arrow</td><td>$switch_connected_port_hr</td> 1536 1545 <td sorttable_customkey="$host_short">$db_switch_parent{$sw}->{'switch'}</td> 1537 1546 <td sorttable_customkey="$ip_sort">$ipv4_address</td> … … 1543 1552 } 1544 1553 else { 1554 my $switch_port_hr = $db_switch_output_port{$sw} =~ s/($SEP_AGGREGATOR_PORT)/: /r; # First occurence 1555 $switch_port_hr =~ s/($SEP_AGGREGATOR_PORT)/ /g; # Other occurence 1556 1545 1557 print <<"END_HTML"; 1546 1558 <tr class="$typerow"> 1547 1559 <td sorttable_customkey="$switch_hostname_sort">$sw</td> 1548 <td class="bklask-port">$ db_switch_output_port{$sw}</td>1560 <td class="bklask-port">$switch_port_hr</td> 1549 1561 <td>$arrow</td><td></td> 1550 1562 <td sorttable_customkey="router">router</td>
Note: See TracChangeset
for help on using the changeset viewer.