Changeset 151

Timestamp:

Jun 8, 2016, 6:59:53 PM (8 years ago)

Author:

g7moreau

Message:

• Add sub computerdb_load and update switch_port_hr if not defined...

File:

• trunk/klask (modified) (11 diffs)

trunk/klask

@@ -7 +7 @@
 use strict;
 use warnings;
-use version; our $VERSION = qv('0.5.5');
+use version; our $VERSION = qv('0.5.6');
 
 use Readonly;
@@ -681 +681 @@
    }
 
+# Load computer database
 sub computerdb_load {
    my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
-   
+
+   LOOP_ON_IP_ADDRESS:
+   for my $ip (keys %{$computerdb}) {
+
+      next LOOP_ON_IP_ADDRESS if exists $computerdb->{$ip}{switch_port_hr};
+      
+      $computerdb->{$ip}{switch_port_hr} = $computerdb->{$ip}{switch_port};
+      }
+
    return $computerdb;
    }
@@ -784 +793 @@
 
    fast_ping(@computer);
-   my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
+   my $computerdb = computerdb_load();
 
    LOOP_ON_COMPUTER:
@@ -812 +821 @@
    my @mac = map { normalize_mac_address($_) } @_;
 
-   my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
+   my $computerdb = computerdb_load();
 
    LOOP_ON_MAC:
@@ -846 +855 @@
 
    my $computerdb = {};
-      $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE") if -e "$KLASK_DB_FILE";
+      $computerdb = computerdb_load() if -e "$KLASK_DB_FILE";
    my $timestamp = time;
 
@@ -1020 +1029 @@
    test_maindb_environnement();
 
-   my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
+   my $computerdb = computerdb_load();
 
    LOOP_ON_COMPUTER:
@@ -1163 +1172 @@
    test_maindb_environnement();
 
-   my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
+   my $computerdb = computerdb_load();
 
    printf "%-27s %-4s            %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
@@ -1199 +1208 @@
    test_maindb_environnement();
 
-   my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
+   my $computerdb = computerdb_load();
 
 #<link rel="stylesheet" type="text/css" href="style-klask.css" />
@@ -1412 +1421 @@
    test_maindb_environnement();
 
-   my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
+   my $computerdb = computerdb_load();
 
    # create a database with the most recent computer by switch port
@@ -1700 +1709 @@
 
 sub cmd_ip_location {
-   my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
+   my $computerdb = computerdb_load();
 
    LOOP_ON_IP_ADDRESS:
@@ -1747 +1756 @@
 
    my $computerdb = {};
-      $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE") if -e "$KLASK_DB_FILE";
+      $computerdb = computerdb_load() if -e "$KLASK_DB_FILE";
    my $timestamp = time;