remove any leading ::ffff: on ipv4 addresses

[spider.git] / perl / USDB.pm

diff --git a/perl/USDB.pm b/perl/USDB.pm
index 719ac66afe30db127d95008c32305d09ef8532dd..478763efb534bb511a4e38c5bf056fa9cccc1c59 100644 (file)
--- a/perl/USDB.pm
+++ b/perl/USDB.pm
@@ -13,22 +13,19 @@ use DXVars;
 use DB_File;
 use File::Copy;
 use DXDebug;
-#use Compress::Zlib;
+use DXUtil;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+#use Compress::Zlib;
 
 use vars qw(%db $present $dbfn);
 
-$dbfn = "$main::data/usdb.v1";
+localdata_mv("usdb.v1");
+$dbfn = localdata("usdb.v1");
 
 sub init
 {
        end();
-       if (tie %db, 'DB_File', $dbfn, O_RDONLY, 0664, $DB_BTREE) {
+       if (tie %db, 'DB_File', $dbfn, O_RDWR, 0664, $DB_BTREE) {
                $present = 1;
                return "US Database loaded";
        }
@@ -50,6 +47,29 @@ sub get
        return @s;
 }
 
+sub _add
+{
+       my ($db, $call, $city, $state) = @_;
+       
+       # lookup the city 
+       my $s = uc "$city|$state";
+       my $ctyn = $db->{$s};
+       unless ($ctyn) {
+               my $no = $db->{'##'} || 1;
+               $ctyn = "#$no";
+               $db->{$s} = $ctyn;
+               $db->{$ctyn} = $s; 
+               $no++;
+               $db->{'##'} = "$no";
+       }
+       $db->{uc $call} = $ctyn; 
+}
+
+sub add
+{
+       _add(\%db, @_);
+}
+
 sub getstate
 {
        return () unless $present;
@@ -64,6 +84,12 @@ sub getcity
        return @s ? $s[0] : undef;
 }
 
+sub del
+{
+       my $call = uc shift;
+       delete $db{$call};
+}
+
 #
 # load in / update an existing DB with a standard format (GZIPPED)
 # "raw" file.
@@ -104,6 +130,8 @@ sub load
        for (@_) {
                my $ofn = shift;
 
+               return "Cannot find $ofn" unless -r $ofn;
+               
                # conditionally handle compressed files (don't cha just lurv live code, this is
                # a rave from the grave and is "in memoriam Flossie" the ICT 1301G I learnt on.
                # {for pedant computer historians a 1301G is an ICT 1301A that has been 
@@ -112,7 +140,7 @@ sub load
                if ($nfn =~ /.gz$/i) {
                        my $gz;
                        eval qq{use Compress::Zlib; \$gz = gzopen(\$ofn, "rb")};
-                       return "Cannot read compressed files $@" if $@;
+                       return "Cannot read compressed files $@ $!" if $@ || !$gz;
                        $nfn =~ s/.gz$//i;
                        my $of = new IO::File ">$nfn" or return "Cannot write to $nfn $!";
                        my ($l, $buf);
@@ -128,19 +156,9 @@ sub load
                        my $l = $_;
                        $l =~ s/[\r\n]+$//;
                        my ($call, $city, $state) = split /\|/, $l;
+
+                       _add(\%dbn, $call, $city, $state);
                        
-                       # lookup the city 
-                       my $s = "$city|$state";
-                       my $ctyn = $dbn{$s};
-                       unless ($ctyn) {
-                               my $no = $dbn{'##'} || 1;
-                               $ctyn = "#$no";
-                               $dbn{$s} = $ctyn;
-                               $dbn{$ctyn} = $s; 
-                               $no++;
-                               $dbn{'##'} = "$no";
-                       }
-                       $dbn{$call} = $ctyn; 
                        $count++;
                }
                $of->close;