X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=7f9139cf8c9c0def2f5f4160cca7a202f0de9781;hb=d575eccdad09a43d6c705d739a4e1cd82e757091;hp=3844e05508e4e77661b8ea3b70e6d9057e8c3929;hpb=dd9bf905904d67616b549091784863d3e34a97ed;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 3844e055..7f9139cf 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,23 +361,31 @@ sub dup
 	$d = int ($d / 60);
 	$d *= 60;
 
+	$by =~ s/-\d+$//g;
+	
 	$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 = substr($text, 0, $duplth) if length $text > $duplth;
 	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
-	$text =~ s/[^a-zA-Z0-9]//g;
-	my $ldupkey = "X$freq|$call|" . uc $text;
-	my $sdupkey = "X$freq|$call|$by";
+	$text =~ s/[^\w]//g;
+	my $ldupkey = "X$freq|$call|$by|$text";
 	my $t = DXDupe::find($ldupkey);
-	return 1 if $t && $t - $main::systime > 0;	
-    $t = DXDupe::find($sdupkey);
-	return 1 if $t && $t - $main::systime > 0;	
+	return 1 if $t && $t - $main::systime > 0;
 	DXDupe::add($ldupkey, $main::systime+$dupage);
-	DXDupe::add($sdupkey, $main::systime+$dupage);
+#	my $sdupkey = "X$freq|$call|$by";
+#	$t = DXDupe::find($sdupkey);
+#	return 1 if $t && $t - $main::systime > 0;	
+#	DXDupe::add($sdupkey, $main::systime+$dupage);
 	return 0;
 }