From: Dirk Koopman <djk@tobit.co.uk>
Date: Fri, 14 Jun 2024 21:08:23 +0000 (+0100)
Subject: fix no_node_in_dupe
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=9fa9d75454811315e6ec6dd5762cb6b728a0ae3a;hp=24fb0e58dd1f7bc62eb3924b81d37ea3763535f4;p=spider.git

fix no_node_in_dupe
---

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 88f13a00..d04ece05 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -536,17 +536,16 @@ 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'") 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+$//;