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

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 99f0c83e..9a4b9724 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,18 +338,26 @@ 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];
 		}
 	}
-	$text = substr($text, 0, $duplth) if length $text > $duplth; 
+	my $otext = $text;
 	$text = pack("C*", map {$_ & 127} unpack("C*", $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;
-	DXDupe::add($ldupkey, $main::systime+$dupage);
+	if ($otext) {
+		DXDupe::add($ldupkey, $main::systime+$dupage);
+		$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
+		$ldupkey = "X$freq|$call|$by|$otext";
+		$t = DXDupe::find($ldupkey);
+		return 1 if $t && $t - $main::systime > 0;
+		DXDupe::add($ldupkey, $main::systime+$dupage);
+	}
 #	my $sdupkey = "X$freq|$call|$by";
 #	$t = DXDupe::find($sdupkey);
 #	return 1 if $t && $t - $main::systime > 0;