X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=3bd74c4fdca77fa1c74baf9ac5a604c4aed415a6;hb=809ac2e606559d68ff6e0580c0681fc71c6bc4b9;hp=85678a4dc2cf398ccb2a69fdac5ab4eac1b365f0;hpb=4a537d5ee952ce14ac88ebe07e4f015155b576ee;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 85678a4d..3bd74c4f 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -361,18 +361,22 @@ sub dup
 	$d = int ($d / 60);
 	$d *= 60;
 
+	$by =~ s/-\d+$//g;
+	
 	$freq = sprintf "%.1f", $freq;       # normalise frequency
 	$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
 
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
-	$text = unpad($text);
-	$text = substr($text, 0, $duplth) if length $text > $duplth; 
+	$text = uc unpad($text);
+	my ($prefix) = $text =~ /\b(\w{1,4})$/;
+	$text =~ s/\b\w{1,4}$// if $prefix && is_prefix($prefix);
+	$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 $ldupkey = "X$freq|$call|$by|" . uc $text;
+	$text =~ s/[^\w]//g;
+	my $ldupkey = "X$freq|$call|$by|$text";
 	my $t = DXDupe::find($ldupkey);
-	return 1 if $t && $t - $main::systime > 0;	
+	return 1 if $t && $t - $main::systime > 0;
 	DXDupe::add($ldupkey, $main::systime+$dupage);
 #	my $sdupkey = "X$freq|$call|$by";
 #	$t = DXDupe::find($sdupkey);