X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FSpot.pm;h=727ab07a3969e50a882c8fbbaac042778c1f5988;hb=4f57a4444e5051510df1567823009d351f95db20;hp=d14e310eefdff0ef3a35dc1d0cd988902b98d5dd;hpb=8c2ef519e111e9a36f917828dac0fe1e2caae3f4;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index d14e310e..727ab07a 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -348,6 +348,7 @@ sub dup
 	}
 	my $otext = $text;
 	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
+	$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
 	$text =~ s/[^\w]//g;
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
 	my $ldupkey = "X$freq|$call|$by|$text";
@@ -355,16 +356,13 @@ sub dup
 	return 1 if $t && $t - $main::systime > 0;
 	DXDupe::add($ldupkey, $main::systime+$dupage);
 	$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
-	if ( length $otext && $otext ne $text) {
+	$otext =~ s/\s+$//;
+	if (length $otext && $otext ne $text) {
 		$ldupkey = "X$freq|$call|$by|$otext";
 		$t = DXDupe::find($ldupkey);
 		return 1 if $t && $t - $main::systime > 0;
 		DXDupe::add($ldupkey, $main::systime+$dupage);
 	}
-#	my $sdupkey = "X$freq|$call|$by";
-#	$t = DXDupe::find($sdupkey);
-#	return 1 if $t && $t - $main::systime > 0;	
-#	DXDupe::add($sdupkey, $main::systime+$dupage);
 	return 0;
 }