projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct convert-users-v3-to-v4.pl
[spider.git]
/
perl
/
USDB.pm
diff --git
a/perl/USDB.pm
b/perl/USDB.pm
index cba7ddb96c96f6b783e9e4f6db3e168f4e0f2184..478763efb534bb511a4e38c5bf056fa9cccc1c59 100644
(file)
--- a/
perl/USDB.pm
+++ b/
perl/USDB.pm
@@
-13,17
+13,14
@@
use DXVars;
use DB_File;
use File::Copy;
use DXDebug;
use DB_File;
use File::Copy;
use DXDebug;
-
#use Compress::Zlib
;
+
use DXUtil
;
-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);
use vars qw(%db $present $dbfn);
-$dbfn = "$main::data/usdb.v1";
+localdata_mv("usdb.v1");
+$dbfn = localdata("usdb.v1");
sub init
{
sub init
{
@@
-133,6
+130,8
@@
sub load
for (@_) {
my $ofn = shift;
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
# 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
+140,7
@@
sub load
if ($nfn =~ /.gz$/i) {
my $gz;
eval qq{use Compress::Zlib; \$gz = gzopen(\$ofn, "rb")};
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);
$nfn =~ s/.gz$//i;
my $of = new IO::File ">$nfn" or return "Cannot write to $nfn $!";
my ($l, $buf);