Changeset 320

Timestamp:

Oct 31, 2017, 10:46:28 AM (7 years ago)

Author:

g7moreau

Message:

• Use Text::Table in exportdb command (txt format)

File:

• trunk/klask (modified) (3 diffs)

trunk/klask

@@ -1669 +1669 @@
    my $computerdb = computerdb_load();
 
-   printf "%-28s %8s              %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
-   print "--------------------------------------------------------------------------------------------------------------------------------------------\n";
+   #printf "%-28s %8s              %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
+   #print "--------------------------------------------------------------------------------------------------------------------------------------------\n";
+   my $tb_computer = Text::Table->new(
+      {align => 'left',   align_title => 'left',   title => 'Switch'},
+      {align => 'right',  align_title => 'right',  title => 'Port'},
+      {align => 'center', align_title => 'center', title => 'Link'},
+      {align => 'left',   align_title => 'left',   title => 'Hostname-FQ'},
+      {align => 'left',   align_title => 'left',   title => 'IPv4-Address'},
+      {align => 'left',   align_title => 'left',   title => 'MAC-Address'},
+      {align => 'left',   align_title => 'left',   title => 'Date'},
+      {align => 'left',   align_title => 'left',   title => 'VLAN'},
+      );
 
    LOOP_ON_IP_ADDRESS:
@@ -1686 +1696 @@
       $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 %12s %-40s %-15s %-18s %-16s %s\n",
+      my $arrow ='<---';
+         $arrow ='<===' if $computerdb->{$ip}{'switch_port_hr'} =~ m/^(Trk|Br|Po)/;
+
+      $tb_computer->add(
          $computerdb->{$ip}{'switch_hostname'} || $computerdb->{$ip}{'switch_description'},
          $computerdb->{$ip}{'switch_port_hr'},
@@ -1697 +1707 @@
          $computerdb->{$ip}{'mac_address'},
          $date,
-         $vlan;
-      }
+         $vlan,
+         );
+#      printf "%-28s %8s %12s %-40s %-15s %-18s %-16s %s\n",
+#         $computerdb->{$ip}{'switch_hostname'} || $computerdb->{$ip}{'switch_description'},
+#         $computerdb->{$ip}{'switch_port_hr'},
+#         $arrow,
+#         $computerdb->{$ip}{'hostname_fq'},
+#         $ip,
+#         $computerdb->{$ip}{'mac_address'},
+#         $date,
+ #        $vlan;
+      }
+
+   print $tb_computer->title();
+   print $tb_computer->rule('-');
+   print $tb_computer->body();
+
    return;
    }