use DXDupe;
use strict;
+
use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from
$dirprefix $param
$duplth $dupage $filterdef);
$filterdef = bless ([
# tag, sort, field, priv, special parser
- ['by', 'c', 7],
- ['origin', 'c', 8],
- ['channel', 'n', 9],
- ['by_dxcc', 'n', 10],
- ['by_itu', 'n', 11],
- ['by_zone', 'n', 12],
- ['origin_dxcc', 'c', 13],
- ['origin_itu', 'c', 14],
- ['origin_itu', 'c', 15],
+ ['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
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 {
# enter the spot for dup checking and return true if it is already a dup
sub dup
{
- my ($d, $sfi, $k, $a, $text) = @_;
+ 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";
+ my $dupkey = "W$d|$sfi|$k|$a|$call";
return DXDupe::check($dupkey, $main::systime+$dupage);
}