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

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 88f13a00..d25ed122 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -536,24 +536,23 @@ sub dup
 
 	# new feature: don't include the origin node in Spot dupes
 	# default = true
-	unless ($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');
-		$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;
-	}
+	$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'" . ($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;