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

diff --git a/perl/USDB.pm b/perl/USDB.pm
index ed519b4b..042e9190 100644
--- a/perl/USDB.pm
+++ b/perl/USDB.pm
@@ -13,13 +13,7 @@ use DXVars;
 use DB_File;
 use File::Copy;
 use DXDebug;
-use Compress::Zlib;
-
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+#use Compress::Zlib;
 
 use vars qw(%db $present $dbfn);
 
@@ -28,7 +22,11 @@ $dbfn = "$main::data/usdb.v1";
 sub init
 {
 	end();
-	tie %db, 'DB_File', $dbfn and $present = 1;
+	if (tie %db, 'DB_File', $dbfn, O_RDWR, 0664, $DB_BTREE) {
+		$present = 1;
+		return "US Database loaded";
+	}
+	return "US Database not loaded";
 }
 
 sub end
@@ -46,6 +44,29 @@ sub get
 	return @s;
 }
 
+sub _add
+{
+	my ($db, $call, $city, $state) = @_;
+	
+	# lookup the city 
+	my $s = uc "$city|$state";
+	my $ctyn = $db->{$s};
+	unless ($ctyn) {
+		my $no = $db->{'##'} || 1;
+		$ctyn = "#$no";
+		$db->{$s} = $ctyn;
+		$db->{$ctyn} = $s; 
+		$no++;
+		$db->{'##'} = "$no";
+	}
+	$db->{uc $call} = $ctyn; 
+}
+
+sub add
+{
+	_add(\%db, @_);
+}
+
 sub getstate
 {
 	return () unless $present;
@@ -60,6 +81,12 @@ sub getcity
 	return @s ? $s[0] : undef;
 }
 
+sub del
+{
+	my $call = uc shift;
+	delete $db{$call};
+}
+
 #
 # load in / update an existing DB with a standard format (GZIPPED)
 # "raw" file.
@@ -90,38 +117,54 @@ 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;
+
+		return "Cannot find $ofn" unless -r $ofn;
+		
+		# 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 $@ || !$gz;
+			$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;
+
+			_add(\%dbn, $call, $city, $state);
 			
-			# lookup the city 
-			my $s = "$city|$state";
-			my $ctyn = $dbn{$s};
-			unless ($ctyn) {
-				my $no = $dbn{'##'} || 1;
-				$ctyn = "#$no";
-				$dbn{$s} = $ctyn;
-				$dbn{$ctyn} = $s; 
-				$no++;
-				$dbn{'##'} = "$no";
-			}
-			$dbn{$call} = $ctyn; 
+			$count++;
 		}
-		$f->gzclose;
+		$of->close;
+		unlink $nfn;
 	}
 	
 	untie %dbn;
 	rename "$dbfn.new", $dbfn;
+	return "$count records";
 }
 
 1;