#
#
+package USDB;
+
use strict;
use DXVars;
$main::build += $VERSION;
$main::branch += $BRANCH;
-use vars qw(%db $present);
+use vars qw(%db $present $dbfn);
-my $dbfn = "$main::data/usdb.v1";
+$dbfn = "$main::data/usdb.v1";
sub init
{
#
# Note that this removes and overwrites the existing DB file
# You will need to init again after doing this
-#
+#
sub load
{
+ return "Need a filename" unless @_;
+
# create the new output file
my $a = new DB_File::BTREEINFO;
$a->{psize} = 4096 * 2;
- my $s;
- if ($s = -s $dbfn && $s > 1024 * 1024) {
- $a->{cachesize} = int(($s / (1024*1024)) / 2) * 1024 * 1024;
+ my $s = 0;
+
+ # guess a cache size
+ for (@_) {
+ my $ts = -s;
+ $s = $ts if $ts > $s;
+ }
+ if ($s > 1024 * 1024) {
+ $a->{cachesize} = int($s / (1024*1024)) * 3 * 1024 * 1024;
}
+
+# print "cache size " . $a->{cachesize} . "\n";
+
my %dbn;
if (-e $dbfn ) {
syscopy($dbfn, "$dbfn.new") or return "cannot copy $dbfn -> $dbfn.new $!";
for (@_) {
my $fn = shift;
my $f = gzopen($fn, "r") or return "Cannot open $fn $!";
- while ($f->gzreadline) {
- chomp;
- my ($call, $city, $state) = split /\|/;
+ my $l;
+ while ($f->gzreadline($l)) {
+ chomp $l;
+ my ($call, $city, $state) = split /\|/, $l;
# lookup the city
my $s = "$city|$state";