X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=995bad539e4bb9450134a515a4aa642a21c014d9;hb=c977c78eb2f5a33471c9eb5f836ceb8581793fe2;hp=61bc1a25959424bce67ced5ee6a37660e949ccb7;hpb=c59e6497c9717e7585fb87c7c9ce9aee0d62a373;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 61bc1a25..995bad53 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -333,18 +333,19 @@ sub dup
 
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
-	$text = unpad($text);
+	$text = uc unpad($text);
+	my ($prefix) = $text =~ /\b(\w{1,4})$/;
+	$text =~ s/\b\w{1,4}$// if $prefix && Prefix::extract($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|" . uc $text;
-	my $sdupkey = "X$freq|$call|$by";
+	my $ldupkey = "X$freq|$call|$by|$text";
 	my $t = DXDupe::find($ldupkey);
-	return 1 if $t && $t - $main::systime > 0;	
-    $t = DXDupe::find($sdupkey);
-	return 1 if $t && $t - $main::systime > 0;	
+	return 1 if $t && $t - $main::systime > 0;
 	DXDupe::add($ldupkey, $main::systime+$dupage);
-	DXDupe::add($sdupkey, $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;
 }