X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FUSDB.pm;h=719ac66afe30db127d95008c32305d09ef8532dd;hb=81f141825cc8846f0e496ebf602e8e6536476b82;hp=14f9fc2ec49fa860b8107728a5414847d9eb5d9a;hpb=bbed459bfb3fdba0379fed67c324539338c84d0e;p=spider.git

diff --git a/perl/USDB.pm b/perl/USDB.pm
index 14f9fc2e..719ac66a 100644
--- a/perl/USDB.pm
+++ b/perl/USDB.pm
@@ -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,8 +100,28 @@ 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 $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;
+		}
+
 		my $of = new IO::File "$ofn" or return "Cannot read $ofn $!";
 
 		while (<$of>) {
@@ -122,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;