try to prevent surprises on non restarted but upgraded nodes

[spider.git] / perl / USDB.pm

diff --git a/perl/USDB.pm b/perl/USDB.pm
index 89cd9fe5661c9e1988e6e4a2954f58fdf9a2d85f..14f9fc2ec49fa860b8107728a5414847d9eb5d9a 100644 (file)
--- a/perl/USDB.pm
+++ b/perl/USDB.pm
@@ -13,7 +13,7 @@ use DXVars;
 use DB_File;
 use File::Copy;
 use DXDebug;
-use Compress::Zlib;
+#use Compress::Zlib;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
@@ -95,18 +95,19 @@ sub load
        
        my %dbn;
        if (-e $dbfn ) {
-               syscopy($dbfn, "$dbfn.new") or return "cannot copy $dbfn -> $dbfn.new $!";
+               copy($dbfn, "$dbfn.new") or return "cannot copy $dbfn -> $dbfn.new $!";
        }
        
        tie %dbn, 'DB_File', "$dbfn.new", O_RDWR|O_CREAT, 0664, $a or return "cannot tie $dbfn.new $!";
        
        # now write away all the files
        for (@_) {
-               my $fn = shift;
-               my $f = gzopen($fn, "r") or return "Cannot open $fn $!";
-               my $l;
-               while ($f->gzreadline($l)) {
-                       chomp $l;
+               my $ofn = shift;
+               my $of = new IO::File "$ofn" or return "Cannot read $ofn $!";
+
+               while (<$of>) {
+                       my $l = $_;
+                       $l =~ s/[\r\n]+$//;
                        my ($call, $city, $state) = split /\|/, $l;
                        
                        # lookup the city 
@@ -122,7 +123,8 @@ sub load
                        }
                        $dbn{$call} = $ctyn; 
                }
-               $f->gzclose;
+               $of->close;
+               unlink $ofn;
        }
        
        untie %dbn;