projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
complete unconpression
[spider.git]
/
perl
/
USDB.pm
diff --git
a/perl/USDB.pm
b/perl/USDB.pm
index ed519b4b86aa5e2cc03d6222ffcb824586774fbe..d5ac1d8a59cd2a5ea5fe90e77d60eea13965bd3f 100644
(file)
--- a/
perl/USDB.pm
+++ b/
perl/USDB.pm
@@
-28,7
+28,12
@@
$dbfn = "$main::data/usdb.v1";
sub init
{
end();
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
}
sub end
@@
-90,18
+95,19
@@
sub load
my %dbn;
if (-e $dbfn ) {
my %dbn;
if (-e $dbfn ) {
-
sys
copy($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
for (@_) {
}
tie %dbn, 'DB_File', "$dbfn.new", O_RDWR|O_CREAT, 0664, $a or return "cannot tie $dbfn.new $!";
# now write away all the files
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;
+ 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
my ($call, $city, $state) = split /\|/, $l;
# lookup the city
@@
-117,11
+123,13
@@
sub load
}
$dbn{$call} = $ctyn;
}
}
$dbn{$call} = $ctyn;
}
- $f->gzclose;
+ $of->close;
+ unlink $ofn;
}
untie %dbn;
rename "$dbfn.new", $dbfn;
}
untie %dbn;
rename "$dbfn.new", $dbfn;
+ return ();
}
1;
}
1;