use DXLog;
use Julian;
use IO::File;
-use Carp;
+use DXDebug;
+use DXDupe;
use strict;
-use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from);
+
+use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from
+ $dirprefix $param
+ $duplth $dupage $filterdef);
$fp = 0; # the DXLog fcb
$date = 0; # the unix time of the WWV (notional)
$from = ""; # who this came from
@allowed = (); # if present only these callsigns are regarded as valid WWV updators
@denied = (); # if present ignore any wwv from these callsigns
-my $dirprefix = "$main::data/wwv";
-my $param = "$dirprefix/param";
+$duplth = 20; # the length of text to use in the deduping
+$dupage = 12*3600; # the length of time to hold spot dups
+
+$dirprefix = "$main::data/wwv";
+$param = "$dirprefix/param";
+
+$filterdef = bless ([
+ # tag, sort, field, priv, special parser
+ ['by', 'c', 0],
+ ['origin', 'c', 1],
+ ['channel', 'c', 2],
+ ['by_dxcc', 'nc', 3],
+ ['by_itu', 'ni', 4],
+ ['by_zone', 'nz', 5],
+ ['origin_dxcc', 'nc', 6],
+ ['origin_itu', 'ni', 7],
+ ['origin_zone', 'nz', 8],
+ ], 'Filter::Cmd');
sub init
{
$fp = DXLog::new('wwv', 'dat', 'm');
- mkdir $dirprefix, 0777 if !-e $dirprefix; # now unnecessary DXLog will create it
do "$param" if -e "$param";
confess $@ if $@;
}
sub update
{
my ($mydate, $mytime, $mysfi, $mya, $myk, $myforecast, $myfrom, $mynode, $myr) = @_;
- if ((@allowed && grep {$_ eq $from} @allowed) ||
- (@denied && !grep {$_ eq $from} @denied) ||
+ $myfrom =~ s/-\d+$//;
+ if ((@allowed && grep {$_ eq $myfrom} @allowed) ||
+ (@denied && !grep {$_ eq $myfrom} @denied) ||
(@allowed == 0 && @denied == 0)) {
# my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
- if ($mydate >= $date) {
+ if ($mydate > $date) {
if ($myr) {
$r = 0 + $myr;
} else {
{
my $from = shift;
my $to = shift;
- my @date = $fp->unixtoj(shift);
+ my $date = $fp->unixtoj(shift);
my $pattern = shift;
my $search;
my @out;
$fp->close; # close any open files
- my $fh = $fp->open(@date);
+ my $fh = $fp->open($date);
for ($count = 0; $count < $to; ) {
my @in = ();
if ($fh) {
#
sub readfile
{
- my @date = $fp->unixtoj(shift);
- my $fh = $fp->open(@date);
+ my $date = $fp->unixtoj(shift);
+ my $fh = $fp->open($date);
my @spots = ();
my @in;
}
return @in;
}
+
+# enter the spot for dup checking and return true if it is already a dup
+sub dup
+{
+ my ($d, $sfi, $k, $a, $text, $call) = @_;
+
+ # dump if too old
+ return 2 if $d < $main::systime - $dupage;
+
+ my $dupkey = "W$d|$sfi|$k|$a|$call";
+ return DXDupe::check($dupkey, $main::systime+$dupage);
+}
+
+sub listdups
+{
+ return DXDupe::listdups('W', $dupage, @_);
+}
1;
__END__;
+