detail messaging

[spider.git] / perl / USDB.pm

diff --git a/perl/USDB.pm b/perl/USDB.pm
index 3ee18825d04b89754a8d2c1a8559f3768fe58857..719ac66afe30db127d95008c32305d09ef8532dd 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+)/ );
@@ -30,10 +30,9 @@ sub init
        end();
        if (tie %db, 'DB_File', $dbfn, O_RDONLY, 0664, $DB_BTREE) {
                $present = 1;
-               dbg("US Database loaded");
-       } else {
-               dbg("US Database not loaded");
+               return "US Database loaded";
        }
+       return "US Database not loaded";
 }
 
 sub end
@@ -101,20 +100,33 @@ sub load
        tie %dbn, 'DB_File', "$dbfn.new", O_RDWR|O_CREAT, 0664, $a or return "cannot tie $dbfn.new $!";
        
        # now write away all the files
+       my $count = 0;
        for (@_) {
-               my $fn = shift;
-               my $if = gzopen($fn, "r") or return "Cannot open $fn $!";
-               my $ofn = "$fn.upk";
-               my $of = new IO::File "+>$ofn" or return "Cannot open $ofn $!";
-               my ($l, $buf);
-               while ($l = $if->gzread($buf)) {
-                       $of->write($buf, $l);
+               my $ofn = shift;
+
+               # 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 
+               # Galdorised[tm] (for instance had decent IOs and a 24 pre-modify instruction)}
+               my $nfn = $ofn;
+               if ($nfn =~ /.gz$/i) {
+                       my $gz;
+                       eval qq{use Compress::Zlib; \$gz = gzopen(\$ofn, "rb")};
+                       return "Cannot read compressed files $@" if $@;
+                       $nfn =~ s/.gz$//i;
+                       my $of = new IO::File ">$nfn" or return "Cannot write to $nfn $!";
+                       my ($l, $buf);
+                       $of->write($buf, $l) while ($l = $gz->gzread($buf));
+                       $gz->gzclose;
+                       $of->close;
+                       $ofn = $nfn;
                }
-               $if->gzclose;
-               $of->seek(0, 0);
 
-               while ($of->getline()) {
-                       chomp $l;
+               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 
@@ -129,14 +141,15 @@ sub load
                                $dbn{'##'} = "$no";
                        }
                        $dbn{$call} = $ctyn; 
+                       $count++;
                }
                $of->close;
-               unlink $ofn;
+               unlink $nfn;
        }
        
        untie %dbn;
        rename "$dbfn.new", $dbfn;
-       return ();
+       return "$count records";
 }
 
 1;