Changeset 233

Timestamp:

Mar 11, 2017, 10:56:58 PM (7 years ago)

Author:

g7moreau

Message:

• Just export txt format aligment

File:

• trunk/klask (modified) (5 diffs)

trunk/klask

@@ -1380 +1380 @@
    my $computerdb = computerdb_load();
 
-   printf "%-28s %8s            %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
+   printf "%-28s %8s              %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
    print "--------------------------------------------------------------------------------------------------------------------------------------------\n";
 
@@ -1386 +1386 @@
    for my $ip (Net::Netmask::sort_by_ip_address(keys %{$computerdb})) {
 
-#      next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} eq 'unknow';
-
       # to be improve in the future
       next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} eq ($computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description}); # switch on himself !
-
-# dans le futur
-#      next if $computerdb->{$ip}{hostname_fq} eq 'unknow';
 
       my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $computerdb->{$ip}{timestamp};
@@ -1402 +1397 @@
       $vlan = $computerdb->{$ip}{network}.'('.get_current_vlan_id($computerdb->{$ip}{network}).')' if $computerdb->{$ip}{network};
 
-      my $arrow ='<-------';
-         $arrow ='<=======' if $computerdb->{$ip}{switch_port_hr} =~ m/^(Trk|Br|Po)/;
-
-      printf "%-28s %8s  %8s  %-40s %-15s %-18s %-16s %s\n",
+      my $arrow ='<-----------';
+         $arrow ='<===========' if $computerdb->{$ip}{switch_port_hr} =~ m/^(Trk|Br|Po)/;
+
+      printf "%-28s %8s %12s %-40s %-15s %-18s %-16s %s\n",
          $computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description},
          $computerdb->{$ip}{switch_port_hr},
@@ -2526 +2521 @@
    print "---------------------------------------------\n";
    for my $sw (sort keys %db_switch_output_port) {
-      my $arrow ='+-->';
-         $arrow ='+==>' if $db_switch_output_port{$sw} =~ m/^(Trk|Br|Po)/;
+      my $arrow ='-->';
+         $arrow ='==>' if $db_switch_output_port{$sw} =~ m/^(Trk|Br|Po)/;
       if (exists $db_switch_parent{$sw}) {
-         printf "%-28s %8s  %4s  %8s  %-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, $db_switch_parent{$sw}->{port_hr}, $db_switch_parent{$sw}->{'switch'};
+         printf "%-28s %8s %3s %-8s %-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, $db_switch_parent{$sw}->{port_hr}, $db_switch_parent{$sw}->{'switch'};
          }
       else {
-         printf "%-28s %8s  %4s  %8s  %-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, '', 'router';
+         printf "%-28s %8s %3s %-8s %-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, '', 'router';
          }
       }
@@ -2542 +2537 @@
       my ($sw_connect,$port_connect) = split m/ : /xms, $swport;
       for my $sw (keys %{$db_switch_connected_on_port{$swport}}) {
-         my $arrow ='<--+';
-            $arrow ='<==+' if $port_connect =~ m/^(Trk|Br|Po)/;
+         my $arrow ='<--';
+            $arrow ='<==' if $port_connect =~ m/^(Trk|Br|Po)/;
          if (exists $db_switch_output_port{$sw}) {
-            printf "%-28s %8s  %4s  %8s  %-25s\n", $sw_connect, $port_connect, $arrow, $db_switch_output_port{$sw}, $sw;
+            printf "%-28s %8s %3s %-8s %-25s\n", $sw_connect, $port_connect, $arrow, $db_switch_output_port{$sw}, $sw;
             }
          else {
-            printf "%-28s %8s  %4s  %8s  %-25s\n", $sw_connect, $port_connect, $arrow, '', $sw;
+            printf "%-28s %8s %3s %-8s %-25s\n", $sw_connect, $port_connect, $arrow, '', $sw;
             }
          }