X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=f890a87a571bebc27513b15da1ea4d9b49188706;hb=23e3e6f8dc328ab0dd7f9ddae444126b0af12867;hp=53f98fa66900808c7f9d77ee0b623c7a10b4555f;hpb=9cb17cdc59baad6fd8d175ec9a644575cdc8c5d5;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 53f98fa6..f890a87a 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -352,7 +352,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, $by) = @_; 
+	my ($freq, $call, $d, $text, $by, $cty) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
@@ -361,20 +361,26 @@ sub dup
 	$d = int ($d / 60);
 	$d *= 60;
 
-	$by =~ s/-\d+$//g;
+	$by =~ s|[-/]\d+$||;
 	
 	$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);
+	if ($cty && $text && length $text <= 4) {
+		unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) {
+			my @try = Prefix::cty_data($text);
+			$text = "" if $cty == $try[0];
+		}
+	}
 	$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;
+	$text = substr($text, 0, $duplth) if length $text > $duplth;
+	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);