projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add various stats commands
[spider.git]
/
perl
/
AnnTalk.pm
diff --git
a/perl/AnnTalk.pm
b/perl/AnnTalk.pm
index 5a387d219ff30946138c720d92ce36ac058c68b0..982e9c49afc9eb99b679ac180ecbdab8a48af0a4 100644
(file)
--- a/
perl/AnnTalk.pm
+++ b/
perl/AnnTalk.pm
@@
-25,17
+25,22
@@
$filterdef = bless ([
['dest', 'c', 1],
['info', 't', 2],
['group', 't', 3],
['dest', 'c', 1],
['info', 't', 2],
['group', 't', 3],
+ ['origin', 'c', 4],
['wx', 't', 5],
['wx', 't', 5],
- ['origin', 'c', 7, 4],
- ['origin_dxcc', 'c', 10],
- ['origin_itu', 'c', 11],
- ['origin_itu', 'c', 12],
+ ['channel', 'n', 6],
['by_dxcc', 'n', 7],
['by_itu', 'n', 8],
['by_zone', 'n', 9],
['by_dxcc', 'n', 7],
['by_itu', 'n', 8],
['by_zone', 'n', 9],
- ['channel', 'n', 6],
+ ['origin_dxcc', 'n', 10],
+ ['origin_itu', 'n', 11],
+ ['origin_itu', 'n', 12],
], 'Filter::Cmd');
], '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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
# enter the spot for dup checking and return true if it is already a dup
sub dup
# enter the spot for dup checking and return true if it is already a dup
sub dup
@@
-44,9
+49,10
@@
sub dup
chomp $text;
unpad($text);
chomp $text;
unpad($text);
- $text =~ s/[\\\%]\d+//g;
- $text =~ s/[^a-zA-Z0-9]//g;
+ $text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
$text = substr($text, 0, $duplth) if length $text > $duplth;
$text = substr($text, 0, $duplth) if length $text > $duplth;
+ $text = pack("C*", map {$_ & 127} unpack("C*", $text));
+ $text =~ s/[^a-zA-Z0-9]//g;
my $dupkey = "A$to|\L$text";
return DXDupe::check($dupkey, $main::systime + $dupage);
}
my $dupkey = "A$to|\L$text";
return DXDupe::check($dupkey, $main::systime + $dupage);
}