X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FUSDB.pm;h=69e1ead083446e4fbf3fa5c43900299c1418aee9;hb=9c415b19aaaf0497e9cc074f3df56f16fe414e82;hp=c12247a34503b2ce47e3d93dc0251e669726dda9;hpb=c0061eedd6e656543667cf2d204340975eea1ecc;p=spider.git

diff --git a/perl/USDB.pm b/perl/USDB.pm
index c12247a3..69e1ead0 100644
--- 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+)/ );
@@ -101,21 +101,32 @@ 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 read $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->close;
-		$of = new IO::File "$ofn" or return "Cannot read $ofn $!";
+
+		my $of = new IO::File "$ofn" or return "Cannot read $ofn $!";
 
 		while (<$of>) {
-			$l = $_;
+			my $l = $_;
 			$l =~ s/[\r\n]+$//;
 			my ($call, $city, $state) = split /\|/, $l;
 			
@@ -131,14 +142,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;