Changeset 317

Timestamp:

Jul 19, 2018, 9:08:30 PM (6 years ago)

Author:

g7moreau

Message:

• Better command show-domainset

File:

• trunk/ddt/ddt (modified) (5 diffs)

trunk/ddt/ddt

@@ -2143 +2143 @@
 
 sub cmd_show_domainset {
-
-   my $computer_db = ipamdb_load($COMPUTER_YAML);
+   local @ARGV = @_;
+
+   my ($no_header);
+
+   GetOptions(
+      'no-header|H' => \$no_header,
+      );
+
+   my $computer_db = ipamdb_load($COMPUTER_YAML);
+
+   my $tb_computer = Text::Table->new(
+     {align  => 'left',   align_title => 'left',   title => 'DomainSet'},
+     {is_sep => 1,        body        => '  '},
+     {align  => 'left',   align_title => 'left',   title => 'DNS-Extension:'},
+     {is_sep => 1,        body        => '  '},
+     {align  => 'left',   align_title => 'left',   title => 'Date'},
+     {align  => 'left',   align_title => 'left',   title => 'Comment'},
+     );
 
    LOOP_ON_DOMAIN:
@@ -2154 +2170 @@
       next if $domainset_current eq 'version';
 
-      print "$domainset_current\n";
-      }
+      $tb_computer->add($domainset_current) and next LOOP_ON_DOMAIN if not exists $computer_db->{'dset'}{$domainset_current};
+
+      my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime $computer_db->{'dset'}{$domainset_current}{'modify_time'};
+      $year += 1900;
+      $mon++;
+      my $date = sprintf '%04i-%02i-%02i', $year, $mon, $mday;
+
+      my $comment = $computer_db->{'dset'}{$domainset_current}{'comment'};
+      $comment =~ s/^\d\d\d\d-\d\d-\d\d\s//;
+         
+      $tb_computer->add($domainset_current,
+         $computer_db->{'dset'}{$domainset_current}{'dns_extension'},
+         $date,
+         $comment,
+         );
+      }
+
+   print $tb_computer->title(),
+         $tb_computer->rule('-') if not $no_header;
+   print $tb_computer->body();
    }
 
@@ -3098 +3132 @@
  ddt remove-tag [--tag|-t tag]
  ddt search-mac [--mac|-m mac]
- ddt show-domainset
+ ddt show-domainset [--no-header|-H]
  ddt show
  ddt show-pool [--no-header|-H]
@@ -3192 +3226 @@
  ddt remove-tag [--tag|-t tag]
  ddt search-mac [--mac|-m mac]
- ddt show-domainset
+ ddt show-domainset [--no-header|-H]
  ddt show
  ddt show-pool [--no-header|-H]
@@ -3341 +3375 @@
 =head2 show-domainset
 
- ddt show-domainset
+ ddt show-domainset [--no-header|-H]
 
 =head2 show