$dupage = 1*3600; # the length of time to hold spot dups
$maxcalllth = 12; # the max length of call to take into account for dupes
$filterdef = bless ([
- # tag, sort, field, priv, special parser
- ['freq', 'r', 0, 0, \&decodefreq],
- ['on', 'r', 0, 0, \&decodefreq],
- ['call', 'c', 1],
- ['info', 't', 3],
- ['by', 'c', 4],
- ['call_dxcc', 'nc', 5],
- ['by_dxcc', 'nc', 6],
- ['origin', 'c', 7, 9],
- ['call_itu', 'ni', 8],
- ['call_zone', 'nz', 9],
- ['by_itu', 'ni', 10],
- ['by_zone', 'nz', 11],
- ['call_state', 'ns', 12],
- ['by_state', 'ns', 13],
- ['channel', 'c', 14],
-
- ], 'Filter::Cmd');
+ # tag, sort, field, priv, special parser
+ ['freq', 'r', 0, 0, \&decodefreq],
+ ['on', 'r', 0, 0, \&decodefreq],
+ ['call', 'c', 1],
+ ['info', 't', 3],
+ ['by', 'c', 4],
+ ['call_dxcc', 'nc', 5],
+ ['by_dxcc', 'nc', 6],
+ ['origin', 'c', 7, 9],
+ ['call_itu', 'ni', 8],
+ ['call_zone', 'nz', 9],
+ ['by_itu', 'ni', 10],
+ ['by_zone', 'nz', 11],
+ ['call_state', 'ns', 12],
+ ['by_state', 'ns', 13],
+ ['ip', 'c', 14],
+# ['channel', 'c', 15],
+# ['rbn', 'a', 4, 0, \&filterrbnspot],
+ ], 'Filter::Cmd');
$totalspots = $hfspots = $vhfspots = 0;
$use_db_for_search = 0;
+our $usetac = 0;
+our $readback;
+
+if ($usetac) {
+ $readback = `which tac`;
+ chomp $readback;
+}
+
# create a Spot Object
sub new
{
return (0, join(',', @out));
}
+# filter setup for rbn spot so return the regex to detect it
+sub filterrbnspot
+{
+ my $dxchan = shift;
+ return ('-#$');
+}
+
sub init
{
mkdir "$dirprefix", 0777 if !-e "$dirprefix";
while (<$fh>) {
chomp;
my @s = split /\^/;
- if (@s < 12) {
+ 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], $a[2] if @s < 14;
+ push @s, $a[2], $b[2] if @s < 14;
}
-
$main::dbh->spot_insert(\@s, $sth);
$count++;
}
push @out, $_[5];
push @out, @spd[1,2], @spt[1,2], $spd[3], $spt[3];
push @out, $_[6] if $_[6] && is_ipaddr($_[6]);
+
+ # thus we now have:
+ # freq, call, time, comment, spotter, call country code, call itu, call cqzone, spotter country code, spotter itu, spotter cqzone, call state, spotter state, node, spotter ip address
return @out;
}
}
if ($_[3] =~ /(?:QSL|VIA)/i) {
my $q = QSL::get($_[1]) || new QSL $_[1];
- $q->update($_[3], $_[2], $_[4]);
+ $q->update($_[3], $_[2], $_[4]) if $q;
}
}
# $f5 = spotted dxcc country
# $f6 = spotter dxcc country
# $f7 = origin
-#
+# $f8 = ip address
#
# In addition you can specify a range of days, this means that it will start searching
# from <n> days less than today to <m> days less than today
my \@s = split /\\^/;
$checkfilter;
push \@spots, \\\@s;
+ shift \@spots if \@spots > $to + 2;
}
my \$c;
my \$ref;
- for (\$c = \$#spots; \$c >= 0; \$c--) {
- \$ref = \$spots[\$c];
- if ($expr) {
- \$count++;
- next if \$count < \$from; # wait until from
- push(\@out, \$ref);
- last if \$count >= \$to; # stop after to
- }
- }
+ if (\$readback) {
+ foreach \$ref (\@spots) {
+ if ($expr) {
+ \$count++;
+ next if \$count < $from; # wait until from
+ push(\@out, \$ref);
+ last if \$count >= $to; # stop after to
+ }
+ }
+ } else {
+ for (\$c = \$#spots; \$c >= 0; \$c--) {
+ \$ref = \$spots[\$c];
+ if ($expr) {
+ \$count++;
+ next if \$count < $from; # wait until from
+ push(\@out, \$ref);
+ last if \$count >= $to; # stop after to
+ }
+ }
+ }
);
+
+
dbg("Spot eval: $eval") if isdbg('searcheval');
-
- $fp->close; # close any open files
-
+ my $fh;
+ my $now = $fromdate;
for ($i = $count = 0; $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
- my $now = $fromdate->sub($i); # but you can pick which $maxdays worth
- last if $now->cmp($todate) <= 0;
-
- my @spots = ();
- my $fh = $fp->open($now); # get the next file
+ my @spots;
+ last if $now->cmp($todate) <= 0;
+
+ if ($readback) {
+ my $fn = $fp->fn($now->sub($i));
+ dbg("search using tac fn: $fn $i") if isdbg('search');
+ $fh = IO::File->new("$readback $fn |");
+ } else {
+ $fh = $fp->open($now->sub($i)); # get the next file
+ dbg("search fn: $fp->{fn} $i") if isdbg('search');
+ }
if ($fh) {
my $in;
eval $eval; # do the search on this file
projects / spider.git / blobdiff