X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=5c0ce792d673124343e9274b4460eae068969bae;hb=7cf8fad46075f1ca2b8b30475a26a881c031a0ad;hp=982f8db5e19b51dadcfe088adea403b969b58b23;hpb=8178d787d7cc8040fa8958197582bba5c80e6f59;p=spider.git diff --git a/perl/Spot.pm b/perl/Spot.pm index 982f8db5..5c0ce792 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -312,7 +312,7 @@ sub readfile($) # enter the spot for dup checking and return true if it is already a dup sub dup { - my ($freq, $call, $d, $text) = @_; + my ($freq, $call, $d, $text, $by) = @_; # dump if too old return 2 if $d < $main::systime - $dupage; @@ -331,11 +331,14 @@ sub dup $text =~ s/[^a-zA-Z0-9]//g; for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) { my $dt = $d - $_; - my $dupkey = "X$freq|$call|$dt|\L$text"; - return 1 if DXDupe::find($dupkey); + my $ldupkey = "X$freq|$call|$dt|\L$text"; + my $sdupkey = "X$freq|$call|$dt|$by"; + return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey); } - my $dupkey = "X$freq|$call|$d|\L$text"; - DXDupe::add($dupkey, $main::systime+$dupage); + my $ldupkey = "X$freq|$call|$d|\L$text"; + my $sdupkey = "X$freq|$call|$d|$by"; + DXDupe::add($ldupkey, $main::systime+$dupage); + DXDupe::add($sdupkey, $main::systime+$dupage); return 0; }