X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=112fcffed0565c8a9cd4010f4ab05ac52deb5972;hb=be587fd8dade028c10545ffff4be13b0a18f3f91;hp=d351b82ce600db83e222fc046ffb32471c34ab6f;hpb=6fa95fc3ce0732180e59f7d3d1c68b10c887b9b6;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index d351b82c..112fcffe 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -319,7 +319,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;
@@ -328,14 +328,21 @@ sub dup
 	$d = int ($d / 60);
 	$d *= 60;
 
+	# remove SSID or area
+	$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 = 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;