['origin_dxcc', 'nc', 10],
['origin_itu', 'ni', 11],
['origin_zone', 'nz', 12],
+ ['by_state', 'nz', 13],
+ ['origin_state', 'nz', 14],
], 'Filter::Cmd');
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
# enter the spot for dup checking and return true if it is already a dup
sub dup
{
- my ($call, $to, $text) = @_;
+ my ($call, $to, $text, $t) = @_;
+ $t ||= $main::systime + $dupage;
chomp $text;
unpad($text);
$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
$text = substr($text, 0, $duplth) if length $text > $duplth;
$text = pack("C*", map {$_ & 127} unpack("C*", $text));
- $text =~ s/[^a-zA-Z0-9]//g;
+ $text =~ s/[^\#a-zA-Z0-9]//g;
my $dupkey = "A$to|\L$text";
- return DXDupe::check($dupkey, $main::systime + $dupage);
+ return DXDupe::check($dupkey, $t);
}
sub listdups
{
my ($from, $text) = @_;
my $call;
- ($call) = $text =~ /^\s*(?:[Xx]|[Tt][Oo]?)\s+([\w-]+)/;
+ ($call) = $text =~ /^\s*(?:[Xx]|[Tt][Oo]?:?)\s+([\w-]+)/;
($call) = $text =~ /^\s*>\s*([\w-]+)\b/ unless $call;
($call) = $text =~ /^\s*([\w-]+):?\b/ unless $call;
if ($call) {