X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=d25ed1223e43d7dbfc1f7a85fcd3b77d5a5a5f6f;hb=2e8072a50c0521b5a9b1de423d9e633114d4acc0;hp=316eb4b9be4f78484989480cda8b3a17554f084a;hpb=d9327446e316cebc269c98c976bab1eaed8f8ee0;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 316eb4b9..d25ed122 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -77,7 +77,7 @@ our $readback = $main::is_win ? 0 : 1; # don't read spot files backwards if it's
 our $qrggranularity = 1000;	# normalise the qrg to this number of hz (default: 100khz), so tough luck if you have a fumble fingers moment
 our $timegranularity = 600;		# ditto to the nearest 100 seconds 
 our $oldstyle = 0;				# revert to traditional dupe key format
-
+our $no_node_in_dupe = 1;		# remove the node field from dupe considerations. 
 
 if ($readback) {
 	$readback = `which tac`;
@@ -530,24 +530,29 @@ sub dup
 
 	$l = length $text;
 	$dtext .= qq{->final:'$text'($l)} if isdbg('spottext');
-		
-	my $ldupkey = $oldstyle ? "X|$call|$by|$node|$freq|$d|$text" : "X|$call|$by|$node|$qrg|$nd|$text";
 
 	my $t = 0;
+	my $ldupkey;
+
+	# new feature: don't include the origin node in Spot dupes
+	# default = true
+	$node = '' if $no_node_in_dupe;
+	$ldupkey = $oldstyle ? "X|$call|$by|$node|$freq|$d|$text" : "X|$call|$by|$node|$qrg|$nd|$text";
+	
 	$t = DXDupe::find($ldupkey);
-	dbg("Spot::dup ldupkey $ldupkey t '$t'") if isdbg('spotdup');
+	dbg("Spot::dup ldupkey $ldupkey t '$t'" . ($t?' DUPE':' NEW')) if isdbg('spotdup');
 	$dtext .= ' DUPE' if $t;
 	dbg("text transforms: $dtext") if length $text && isdbg('spottext');
 	return 1 if $t > 0;	
 	
 	DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
-
+	
 	$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
 	$otext =~ s/\s+$//;
 	if (length $otext && $otext ne $text) {
 		$ldupkey = $oldstyle ? "X|$freq|$call|$by|$otext" : "X|$qrg|$call|$by|$otext";
 		$t = DXDupe::find($ldupkey);
-		dbg("Spot::dup (OTEXT) ldupkey $ldupkey t '$t'") if isdbg('spotdup');
+		dbg("Spot::dup (OTEXT) ldupkey $ldupkey t '$t'" . ($t?' DUPE':' NEW')) if isdbg('spotdup');
 		if (isdbg('spottext')) {
 			$dtext .= sprintf q{ DUBIOUS '%s'}, join '', @dubious if @dubious;
 			$dtext .= ' DUPE (OTEXT)' if $t;