X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=112fcffed0565c8a9cd4010f4ab05ac52deb5972;hb=37dfbc681a882ea8d82f1c2c4b27b3058b1c30e8;hp=99f0c83ed743934216698b7149ddff59b1647240;hpb=70d6fc010dd321598034d08907d3dfc98414cfca;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 99f0c83e..112fcffe 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -328,6 +328,9 @@ 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;
 
@@ -335,7 +338,7 @@ sub dup
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = uc unpad($text);
 	if ($cty && $text && length $text <= 4) {
-		unless ($text =~ /^CQ/ || $text =~ /^\d+$/) {
+		unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) {
 			my @try = Prefix::cty_data($text);
 			$text = "" if $cty == $try[0];
 		}