X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FUSDB.pm;h=042e9190f4538ac64e26b3171904c309a220986d;hb=b9dffeff7239952814342dad19db3a51def6fab7;hp=cba7ddb96c96f6b783e9e4f6db3e168f4e0f2184;hpb=973a2853ac360d77e8bc6382450c0a9e11da1f52;p=spider.git diff --git a/perl/USDB.pm b/perl/USDB.pm index cba7ddb9..042e9190 100644 --- a/perl/USDB.pm +++ b/perl/USDB.pm @@ -15,12 +15,6 @@ 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 vars qw(%db $present $dbfn); $dbfn = "$main::data/usdb.v1"; @@ -133,6 +127,8 @@ sub load for (@_) { 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 @@ -141,7 +137,7 @@ sub load if ($nfn =~ /.gz$/i) { my $gz; eval qq{use Compress::Zlib; \$gz = gzopen(\$ofn, "rb")}; - return "Cannot read compressed files $@" if $@; + 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);