X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=306bc282582e2b5b634df974f573848768c58f43;hb=e266b6c9d500dde73cf0025a63a8032ea1cf378d;hp=3bd74c4fdca77fa1c74baf9ac5a604c4aed415a6;hpb=dca951f539a50c396d7a94ad9f513a19892d54ad;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 3bd74c4f..306bc282 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,7 +361,7 @@ 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;
@@ -369,8 +369,12 @@ sub dup
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = uc unpad($text);
-	my ($prefix) = $text =~ /\b(\w{1,4})$/;
-	$text =~ s/\b\w{1,4}$// if $prefix && is_prefix($prefix);
+	if ($cty && $text && length $text <= 4) {
+		unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) {
+			my @try = Prefix::cty_data($text);
+			$text = "" if $cty == $try[0];
+		}
+	}
 	$text = substr($text, 0, $duplth) if length $text > $duplth;
 	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
 	$text =~ s/[^\w]//g;