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

diff --git a/perl/USDB.pm b/perl/USDB.pm
index ed519b4b..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+)/ );
@@ -28,7 +28,12 @@ $dbfn = "$main::data/usdb.v1";
 sub init
 {
 	end();
-	tie %db, 'DB_File', $dbfn and $present = 1;
+	if (tie %db, 'DB_File', $dbfn, O_RDONLY, 0664, $DB_BTREE) {
+		$present = 1;
+		dbg("US Database loaded");
+	} else {
+		dbg("US Database not loaded");
+	}
 }
 
 sub end
@@ -90,18 +95,39 @@ 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
+	my $count = 0;
 	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;
+
+		# 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>) {
+			my $l = $_;
+			$l =~ s/[\r\n]+$//;
 			my ($call, $city, $state) = split /\|/, $l;
 			
 			# lookup the city 
@@ -116,12 +142,15 @@ sub load
 				$dbn{'##'} = "$no";
 			}
 			$dbn{$call} = $ctyn; 
+			$count++;
 		}
-		$f->gzclose;
+		$of->close;
+		unlink $nfn;
 	}
 	
 	untie %dbn;
 	rename "$dbfn.new", $dbfn;
+	return "$count records";
 }
 
 1;