#
# Copyright (c) 2000 Dirk Koopman
#
-# $Id$
+#
#
package AnnTalk;
use strict;
+use DXVars;
use DXUtil;
use DXDebug;
use DXDupe;
-use DXVars;
+use DXLog;
+use DXLogPrint;
use vars qw(%dup $duplth $dupage $filterdef);
-$duplth = 60; # the length of text to use in the deduping
-$dupage = 5*24*3600; # the length of time to hold spot dups
+$duplth = 30; # the length of text to use in the deduping
+$dupage = 18*3600; # the length of time to hold ann dups
$filterdef = bless ([
# tag, sort, field, priv, special parser
['by', 'c', 0],
['origin_dxcc', 'nc', 10],
['origin_itu', 'ni', 11],
['origin_zone', 'nz', 12],
- ], 'Filter::Cmd');
+ ['by_state', 'nz', 13],
+ ['origin_state', 'nz', 14],
+ ], 'Filter::Cmd');
+
+our $maxcache = 130;
+our @anncache;
+
+sub init
+{
+ @anncache = DXLog::search(0, $maxcache, $main::systime, 'ann');
+ shift @anncache while @anncache > $maxcache;
+ my $l = @anncache;
+ dbg("AnnTalk: loaded last $l announcements into cache");
+}
-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;
+sub add_anncache
+{
+ push @anncache, [ $main::systime, @_ ];
+ shift @anncache while @anncache > $maxcache;
+}
# 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 = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
+ $text =~ s/[^\#a-zA-Z0-9]//g;
$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$call|$to|\L$text";
+ 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) {