Changeset 82

Timestamp:

Mar 30, 2011, 9:15:33 AM (13 years ago)

Author:

g7moreau

Message:

• Some litle change in format

File:

• trunk/klask (modified) (9 diffs)

trunk/klask

@@ -280 +280 @@
    my $verbose = shift;
 
-   printf "%-25s                %-25s %s\n",'Switch','Description','Type';
-   print "-------------------------------------------------------------------------\n" if $verbose;
+   printf "%-26s                %-25s %s\n",'Switch','Description','Type';
+   print "------------------------------------------------------------------------------\n" if $verbose;
 
    INIT_EACH_SWITCH:
@@ -316 +316 @@
       # Ligne à virer car on récupère maintenant le modèle du switch
       my ($desc, $type) = split m/ : /xms, $sw->{description}, 2;
-      printf "%-25s 0--------->>>> %-25s %s\n", $sw->{hostname}, $desc, $sw->{model} if $verbose;
+      printf "%-26s 0--------->>>> %-25s %s\n", $sw->{hostname}, $desc, $sw->{model} if $verbose;
       }
 
@@ -957 +957 @@
    my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
 
-   printf "%-26s %-4s            %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
+   printf "%-27s %-4s            %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
    print "--------------------------------------------------------------------------------------------------------------------------------------------\n";
 
@@ -976 +976 @@
       my $date = sprintf '%04i-%02i-%02i %02i:%02i', $year, $mon, $mday, $hour, $min;
 
-      printf "%-27s  %2s  <-------  %-40s %-15s %-18s %-16s %s\n",
+      printf "%-28s  %2s  <-------  %-40s %-15s %-18s %-16s %s\n",
          $computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description},
          $computerdb->{$ip}{switch_port},
@@ -1476 +1476 @@
       next ALL_SWITCH if $resol_arp{mac_address} eq 'unknow';
 
-      push @list_switch_ipv4,$resol_arp{ipv4_address};
+      push @list_switch_ipv4, $resol_arp{ipv4_address};
 
       $where{$resol_arp{ipv4_address}} = find_all_switch_port($resol_arp{mac_address}); # find port on all switch
 
       if ($verbose) {
-         my @l = ();
-         for my $c  ( keys %{$where{$resol_arp{ipv4_address}}} ) {
-            push @l, "$c -+ "; #$where{$resol_arp{ipv4_address}}->{$c}{hostname};
-            }
-         print "VERBOSE_3 $one_computer $resol_arp{ipv4_address} $resol_arp{mac_address} --- @l\n";
+#         my @l = ();
+#         for my $c  ( keys %{$where{$resol_arp{ipv4_address}}} ) {
+#            push @l, "$c -+ "; #$where{$resol_arp{ipv4_address}}->{$c}{hostname};
+#            }
+         print "VERBOSE_3 $one_computer $resol_arp{ipv4_address} $resol_arp{mac_address}\n";
+         print "VERBOSE_3 $one_computer --- ",
+            join(' + ', keys %{$where{$resol_arp{ipv4_address}}}),
+            "\n";
          }
 
@@ -1582 +1585 @@
    for my $sw (sort keys %db_switch_output_port) {
       if (exists $db_switch_parent{$sw}) {
-         printf "%-27s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
+         printf "%-28s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
          }
       else {
-         printf "%-27s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
+         printf "%-28s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
          }
       }
@@ -1596 +1599 @@
       for my $sw (keys %{$db_switch_connected_on_port{$swport}}) {
          if (exists $db_switch_output_port{$sw}) {
-            printf "%-27s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
+            printf "%-28s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
             }
          else {
-            printf "%-27s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
+            printf "%-28s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
             }
          }
@@ -1650 +1653 @@
    for my $sw (sort keys %db_switch_output_port) {
       if (exists $db_switch_parent{$sw}) {
-         printf "%-27s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
+         printf "%-28s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
          }
       else {
-         printf "%-27s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
+         printf "%-28s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
          }
       }
@@ -1664 +1667 @@
       for my $sw (keys %{$db_switch_connected_on_port{$swport}}) {
          if (exists $db_switch_output_port{$sw}) {
-            printf "%-27s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
+            printf "%-28s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
             }
          else {
-            printf "%-27s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
+            printf "%-28s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
             }
          }