projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added cty-1603 and changes to wpxloc.raw from AD1C and WB8ZRL.
[spider.git]
/
perl
/
AnnTalk.pm
diff --git
a/perl/AnnTalk.pm
b/perl/AnnTalk.pm
index 0269edaa1e7a9ea4150fff83f9dccaf5efa65e5a..75feb9d92b3c7f71311ffe3917070f6261d6ca36 100644
(file)
--- a/
perl/AnnTalk.pm
+++ b/
perl/AnnTalk.pm
@@
-34,27
+34,30
@@
$filterdef = bless ([
['origin_dxcc', 'nc', 10],
['origin_itu', 'ni', 11],
['origin_zone', 'nz', 12],
['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+)/ );
], '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
{
$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;
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 = pack("C*", map {$_ & 127} unpack("C*", $text));
- $text =~ s/[^a-zA-Z0-9]//g;
+ $text =~ s/[^\#a-zA-Z0-9]//g;
+ $text = substr($text, 0, $duplth) if length $text > $duplth;
my $dupkey = "A$to|\L$text";
my $dupkey = "A$to|\L$text";
- return DXDupe::check($dupkey, $
main::systime + $dupage
);
+ return DXDupe::check($dupkey, $
t
);
}
sub listdups
}
sub listdups
@@
-69,7
+72,7
@@
sub is_talk_candidate
{
my ($from, $text) = @_;
my $call;
{
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) {
($call) = $text =~ /^\s*>\s*([\w-]+)\b/ unless $call;
($call) = $text =~ /^\s*([\w-]+):?\b/ unless $call;
if ($call) {