use DXDupe;
use Data::Dumper;
use QSL;
+use DXSql;
+use Time::HiRes qw(gettimeofday tv_interval);
+
use strict;
['call_itu', 'ni', 8],
['itu', 'ni', 8],
['call_zone', 'nz', 9],
+ ['cq', 'nz', 9],
['zone', 'nz', 9],
['by_itu', 'ni', 10],
['byitu', 'ni', 10],
['by_zone', 'nz', 11],
['byzone', 'nz', 11],
+ ['bycq', 'nz', 11],
['call_state', 'ns', 12],
['state', 'ns', 12],
['by_state', 'ns', 13],
$totalspots = $hfspots = $vhfspots = 0;
$use_db_for_search = 0;
+our %spotcache; # the cache of data within the last $spotcachedays 0 or 2+ days
+our $spotcachedays = 2; # default 2 days worth
+our $minselfspotqrg = 1240000; # minimum freq above which self spotting is allowed
+
our $readback = 1;
if ($readback) {
foreach $f (@f) {
my ($a, $b);
- if (m{^\d+/\d+$}) {
+ if ($f =~ m{^\d+/\d+$}) {
push @out, $f;
} elsif (($a, $b) = $f =~ m{^(\w+)(?:/(\w+))?$}) {
$b = lc $b if $b;
mkdir "$dirprefix", 0777 if !-e "$dirprefix";
$fp = DXLog::new($dirprefix, "dat", 'd');
$statp = DXLog::new($dirprefix, "dys", 'd');
+ my $today = Julian::Day->new(time);
# load up any old spots
if ($main::dbh) {
$main::dbh->spot_create_table;
my $now = Julian::Day->alloc(1995, 0);
- my $today = Julian::Day->new(time);
my $sth = $main::dbh->spot_insert_prepare;
while ($now->cmp($today) <= 0) {
my $fh = $fp->open($now);
dbg("added ipaddr field to spot table");
}
}
+
+ # initialise the cache if required
+ if ($spotcachedays > 0) {
+ my $t0 = [gettimeofday];
+ $spotcachedays = 2 if $spotcachedays < 2;
+ dbg "Spot::init - reading in $spotcachedays days of spots into cache";
+ for (my $i = 0; $i < $spotcachedays; ++$i) {
+ my $now = $today->sub($i);
+ my $fh = $fp->open($now);
+ if ($fh) {
+ my @in;
+ my $rec;
+ for ($rec = 0; <$fh>; ++$rec) {
+ chomp;
+ my @s = split /\^/;
+ if (@s < 14) {
+ my @a = (Prefix::cty_data($s[1]))[1..3];
+ my @b = (Prefix::cty_data($s[4]))[1..3];
+ push @s, $b[1] if @s < 7;
+ push @s, '' if @s < 8;
+ push @s, @a[0,1], @b[0,1] if @s < 12;
+ push @s, $a[2], $b[2] if @s < 14;
+ }
+ unshift @in, \@s;
+ }
+ $fh->close;
+ dbg("Spot::init read $rec spots from " . _cachek($now));
+ $spotcache{_cachek($now)} = \@in;
+ }
+ $now->add(1);
+ }
+ dbg("Spot::init $spotcachedays files of spots read into cache in " . _diffms($t0) . "mS")
+ }
}
sub prefix
{
my $buf = join('^', @_);
$fp->writeunix($_[2], $buf);
+ if ($spotcachedays > 0) {
+ my $now = Julian::Day->new($_[2]);
+ my $day = _cachek($now);
+ my $r = (exists $spotcache{$day}) ? $spotcache{$day} : ($spotcache{$day} = []);
+ unshift @$r, \@_;
+ }
if ($main::dbh) {
$main::dbh->begin_work;
$main::dbh->spot_insert(\@_);
sub search
{
- my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_;
+ my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan) = @_;
my @out;
my $ref;
my $i;
$to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0;
if ($main::dbh && $use_db_for_search) {
- return $main::dbh->spot_search($hint, $dayfrom, $dayto, $to-$from, $dxchan);
+ return $main::dbh->spot_search($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan);
}
# $expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name
my $fh;
my $now = $fromdate;
- my @spots;
- my $recs;
+ my $today = Julian::Day->new($main::systime);
for ($i = $count = 0; $count < $to && $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
last if $now->cmp($todate) <= 0;
-
- my $fn = $fp->fn($now->sub($i));
- if ($readback) {
- dbg("Spot::search search using tac fn: $fn $i") if isdbg('search');
- $fh = IO::File->new("$readback $fn |");
- }
- else {
- dbg("Spot::search search fn: $fp->{fn} $i") if isdbg('search');
- $fh = $fp->open($now->sub($i)); # get the next file
- }
- if ($fh) {
- my $rec = 0;
- my $in;
- while (<$fh>) {
- my @r = split /\^/;
+
+
+ my $this = $now->sub($i);
+ my $fn = $fp->fn($this);
+ my $cachekey = _cachek($this);
+ my $rec = 0;
+
+ if ($spotcachedays > 0 && $spotcache{$cachekey}) {
+ foreach my $r (@{$spotcache{$cachekey}}) {
++$rec;
- if ($dxchan) {
- my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r);
+ if ($dofilter && $dxchan && $dxchan->{spotsfilter}) {
+ my ($gotone, undef) = $dxchan->{spotsfilter}->it(@$r);
next unless $gotone;
}
- if (&$ecode(\@r)) {
+ if (&$ecode($r)) {
++$count;
next if $count < $from;
- if ($readback) {
- push @out, \@r;
- last if $count >= $to;
- } else {
- push @out, \@r;
- shift @out if $count >= $to;
+ push @out, $r;
+ last if $count >= $to;
+ }
+ }
+ dbg("Spot::search cache recs read: $rec") if isdbg('search');
+ } else {
+ if ($readback) {
+ dbg("Spot::search search using tac fn: $fn $i") if isdbg('search');
+ $fh = IO::File->new("$readback $fn |");
+ }
+ else {
+ dbg("Spot::search search fn: $fp->{fn} $i") if isdbg('search');
+ $fh = $fp->open($now->sub($i)); # get the next file
+ }
+ if ($fh) {
+ my $in;
+ while (<$fh>) {
+ chomp;
+ my @r = split /\^/;
+ ++$rec;
+ if ($dofilter && $dxchan && $dxchan->{spotsfilter}) {
+ my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r);
+ next unless $gotone;
+ }
+ if (&$ecode(\@r)) {
+ ++$count;
+ next if $count < $from;
+ if ($readback) {
+ push @out, \@r;
+ last if $count >= $to;
+ } else {
+ push @out, \@r;
+ shift @out if $count >= $to;
+ }
}
}
+ dbg("Spot::search file recs read: $rec") if isdbg('search');
+ last if $count >= $to; # stop after to
}
- dbg("Spot::search recs read: $rec") if isdbg('search');
- last if $count >= $to; # stop after to
-
- return ("Spot search error", $@) if $@;
}
}
+ return ("Spot search error", $@) if $@;
+
@out = sort {$b->[2] <=> $a->[2]} @out if @out;
return @out;
}
{
my $date = Julian::Day->new($main::systime)->sub(1);
genstats($date) unless checkstats($date);
+ clean_cache();
+}
+
+sub _cachek
+{
+ return "$_[0]->[0]|$_[0]->[1]";
+}
+
+sub clean_cache
+{
+ if ($spotcachedays > 0) {
+ my $now = Julian::Day->new($main::systime);
+ for (my $i = $spotcachedays; $i < $spotcachedays + 5; ++$i ) {
+ my $k = _cachek($now->sub($i));
+ if (exists $spotcache{$k}) {
+ dbg("Spot::spotcache deleting day $k, more than $spotcachedays days old");
+ delete $spotcache{$k};
+ }
+ }
+ }
}
1;
projects / spider.git / blobdiff