X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=9f5c8645511711919943fc6564b239f59918bbda;hb=84fe7fa8b0aa9ae28375e769f60a6faef304bb53;hp=982f8db5e19b51dadcfe088adea403b969b58b23;hpb=8178d787d7cc8040fa8958197582bba5c80e6f59;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 982f8db5..9f5c8645 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -312,7 +312,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) = @_; 
+	my ($freq, $call, $d, $text, $by) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
@@ -323,6 +323,11 @@ sub dup
 
 	$freq = sprintf "%.1f", $freq;       # normalise frequency
 	$call = substr($call, 0, 12) if length $call > 12;
+
+	# quick test now for simple case
+	my $sdupkey = "X$freq|$call|$d|$by";
+	return 1 if DXDupe::find($sdupkey);
+	
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
@@ -331,11 +336,14 @@ sub dup
 	$text =~ s/[^a-zA-Z0-9]//g;
 	for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
 		my $dt = $d - $_;
-		my $dupkey = "X$freq|$call|$dt|\L$text";
-		return 1 if DXDupe::find($dupkey);
+		my $ldupkey = "X$freq|$call|$dt|\L$text";
+		my $sdupkey = "X$freq|$call|$dt|$by";
+		return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey);
 	}
-	my $dupkey = "X$freq|$call|$d|\L$text";
-	DXDupe::add($dupkey, $main::systime+$dupage);
+	my $ldupkey = "X$freq|$call|$d|\L$text";
+	$sdupkey = "X$freq|$call|$d|$by";
+	DXDupe::add($ldupkey, $main::systime+$dupage);
+	DXDupe::add($sdupkey, $main::systime+$dupage);
 	return 0;
 }