Changeset 253


Ignore:
Timestamp:
Sep 8, 2017, 5:10:11 PM (3 years ago)
Author:
g7moreau
Message:
  • Can't call function inside string !
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/klask

    r252 r253  
    14991499      $vlan = $computerdb->{$ip}{network}.' ('.get_current_vlan_id($computerdb->{$ip}{network}).')' if $computerdb->{$ip}{network};
    15001500
     1501      my $parent_port_hr = format_aggregator4html($computerdb->{$ip}{switch_port_hr});
     1502
    15011503      print <<"END_HTML";
    15021504  <tr class="$typerow">
    15031505   <td sorttable_customkey="$switch_hostname_sort">$switch_hostname</td>
    1504    <td class="bklask-port">&format_aggregator4html($computerdb->{$ip}{switch_port_hr})</td>
     1506   <td class="bklask-port">$parent_port_hr</td>
    15051507   <td colspan="2">$arrow</td>
    15061508   <td sorttable_customkey="$host_short">$computerdb->{$ip}{hostname_fq}</td>
     
    15451547         my ( $host_short ) = sprintf '%s %3s' , split(m/ \. /xms, $db_switch_parent{$sw}->{'switch'}, 1), $db_switch_parent{$sw}->{port_hr};
    15461548
     1549         my $parent_port_hr = format_aggregator4html($db_switch_output_port{$sw});
     1550         my $child_port_hr  = format_aggregator4html($db_switch_parent{$sw}->{port_hr});
     1551
    15471552         print <<"END_HTML";
    15481553  <tr class="$typerow">
    15491554   <td sorttable_customkey="$switch_hostname_sort">$sw</td>
    1550    <td class="bklask-port">&format_aggregator4html($db_switch_output_port{$sw})</td>
    1551    <td>$arrow</td><td>&format_aggregator4html($db_switch_parent{$sw}->{port_hr})</td>
     1555   <td class="bklask-port">$parent_port_hr</td>
     1556   <td>$arrow</td><td>$child_port_hr</td>
    15521557   <td sorttable_customkey="$host_short">$db_switch_parent{$sw}->{'switch'}</td>
    15531558   <td sorttable_customkey="$ip_sort">$ipv4_address</td>
     
    15591564         }
    15601565      else {
     1566         my $parent_port_hr = format_aggregator4html($db_switch_output_port{$sw});
     1567
    15611568         print <<"END_HTML";
    15621569  <tr class="$typerow">
    15631570   <td sorttable_customkey="$switch_hostname_sort">$sw</td>
    1564    <td class="bklask-port">&format_aggregator4html($db_switch_output_port{$sw})</td>
     1571   <td class="bklask-port">$parent_port_hr</td>
    15651572   <td>$arrow</td><td></td>
    15661573   <td sorttable_customkey="router">router</td>
     
    16021609            my ( $host_short ) = sprintf '%s %3s' , split( m/\./xms, $sw, 1), $db_switch_output_port{$sw};
    16031610
     1611            my $parent_port_hr = format_aggregator4html($port_connect);
     1612            my $child_port_hr  = format_aggregator4html($db_switch_output_port{$sw});
     1613
    16041614            print <<"END_HTML";
    16051615  <tr class="$typerow">
    16061616   <td sorttable_customkey="$switch_hostname_sort">$sw_connect</td>
    1607    <td class="bklask-port">&format_aggregator4html($port_connect)</td>
    1608    <td>$arrow</td><td>&format_aggregator4html($db_switch_output_port{$sw})</td>
     1617   <td class="bklask-port">$parent_port_hr</td>
     1618   <td>$arrow</td><td>$child_port_hr</td>
    16091619   <td sorttable_customkey="$host_short">$sw</td>
    16101620   <td sorttable_customkey="$ip_sort">$ipv4_address</td>
     
    16161626            }
    16171627         else {
     1628            my $parent_port_hr = format_aggregator4html($port_connect);
     1629
    16181630            print <<"END_HTML";
    16191631  <tr class="$typerow">
    16201632   <td sorttable_customkey="$switch_hostname_sort">$sw_connect</td>
    1621    <td class="bklask-port">&format_aggregator4html($port_connect)</td>
     1633   <td class="bklask-port">$parent_port_hr</td>
    16221634   <td>$arrow</td><td></td>
    16231635   <td sorttable_customkey="$sw">$sw</td>
Note: See TracChangeset for help on using the changeset viewer.