Changeset 72

Timestamp:

Nov 3, 2010, 9:33:06 AM (13 years ago)

Author:

g7moreau

Message:

• Add export html for ip-free

File:

• trunk/klask (modified) (4 diffs)

trunk/klask

@@ -928 +928 @@
    print <<'END_HTML';
 <table class="sortable" summary="Klask export database">
- <caption>Klask database</caption>
+ <caption>Klask Host Database</caption>
  <thead>
   <tr>
@@ -1165 +1165 @@
       );
 
+   my %possible_format = (
+      txt  => \&cmd_ip_free_txt,
+      html => \&cmd_ip_free_html,
+      );
+   $format = 'txt' if not defined $possible_format{$format};
+
    @vlan_name = get_list_network() if not @vlan_name;
-
-#   my %possible_format = (
-#      txt  => \&cmd_exportdb_txt,
-#      html => \&cmd_exportdb_html,
-#      );
-#
-#   $format = 'txt' if not defined $possible_format{$format};
-#
-#   $possible_format{$format}->(@ARGV);
 
    my $computerdb = {};
@@ -1182 +1179 @@
    my $timestamp_barrier = $timestamp - (3600 * 24 * $days_to_dead );
 
-   my %result_ip= ();
+   my %result_ip = ();
 
    ALL_NETWORK:
@@ -1217 +1214 @@
       }
 
+   $possible_format{$format}->(%result_ip);
+   }
+
+sub cmd_ip_free_txt {
+   my %result_ip = @_;
+   
    printf "%-15s %-40s %-16s %s\n", qw(IPv4-Address Hostname-FQ Date VLAN);
    print "-------------------------------------------------------------------------------\n";
-   LOOP_ON_RESULT:
+   LOOP_ON_IP_ADDRESS:
    foreach my $ip (Net::Netmask::sort_by_ip_address(keys %result_ip)) {
          printf "%-15s %-40s %-16s %s\n", $ip, $result_ip{$ip}->{hostname_fq}, $result_ip{$ip}->{date_last_detection}, $result_ip{$ip}->{vlan};
       }
+   }
+
+sub cmd_ip_free_html {
+   my %result_ip = @_;
+
+   print <<'END_HTML';
+<table class="sortable" summary="Klask export database">
+ <caption>Klask IP Free Database</caption>
+ <thead>
+  <tr>
+   <th scope="col" class="hklask-ipv4">IPv4-Address</th>
+   <th scope="col" class="sorttable_alpha">Hostname-FQ</th>
+   <th scope="col" class="sorttable_alpha">VLAN</th>
+   <th scope="col" class="hklask-date">Date</th>
+  </tr>
+ </thead>
+ <tfoot>
+  <tr>
+   <th scope="col" class="fklask-ipv4">IPv4-Address</th>
+   <th scope="col" class="fklask-hostname">Hostname</th>
+   <th scope="col" class="fklask-vlan">VLAN</th>
+   <th scope="col" class="fklask-date">Date</th>
+  </tr>
+ </tfoot>
+ <tbody>
+END_HTML
+
+   my $typerow = 'even';
+
+   LOOP_ON_IP_ADDRESS:
+   foreach my $ip (Net::Netmask::sort_by_ip_address(keys %result_ip)) {
+
+      $typerow = $typerow eq 'even' ? 'odd' : 'even';
+
+      my $ip_sort = sprintf '%03i%03i%03i%03i', split m/ \. /xms, $ip;
+      my ( $host_short ) = split m/ \. /xms, $result_ip{$ip}->{hostname_fq};
+
+      print <<"END_HTML";
+  <tr class="$typerow">
+   <td sorttable_customkey="$ip_sort">$ip</td>
+   <td sorttable_customkey="$host_short">$result_ip{$ip}->{hostname_fq}</td>
+   <td>$result_ip{$ip}->{vlan}</td>
+   <td>$result_ip{$ip}->{date_last_detection}</td>
+  </tr>
+END_HTML
+      }
+   print <<'END_HTML';
+ </tbody>
+</table>
+END_HTML
    }