From 121d35860e898f6678286ba0ef5d1ea7ad71a691 Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Mon, 17 Jun 2024 14:42:16 +0100 Subject: [PATCH] normalise spot dupe fields, normalise qrg by 25khz --- perl/Spot.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perl/Spot.pm b/perl/Spot.pm index d25ed122..0b622a1c 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -74,7 +74,7 @@ our $spotcachedays = 2; # default 2 days worth our $minselfspotqrg = 1240000; # minimum freq above which self spotting is allowed our $readback = $main::is_win ? 0 : 1; # don't read spot files backwards if it's windows -our $qrggranularity = 1000; # normalise the qrg to this number of hz (default: 100khz), so tough luck if you have a fumble fingers moment +our $qrggranularity = 25; # normalise the qrg to this number of hz (default: 25khz), 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. @@ -537,7 +537,7 @@ sub dup # 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"; + $ldupkey = $oldstyle ? "X|$call|$by|$freq|$node|$d|$text" : "X|$call|$by|$qrg|$node|$nd|$text"; $t = DXDupe::find($ldupkey); dbg("Spot::dup ldupkey $ldupkey t '$t'" . ($t?' DUPE':' NEW')) if isdbg('spotdup'); @@ -550,7 +550,7 @@ sub dup $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"; + $ldupkey = $oldstyle ? "X|$call|$by|$freq|$otext" : "X|$call|$by|$qrg|$otext"; $t = DXDupe::find($ldupkey); dbg("Spot::dup (OTEXT) ldupkey $ldupkey t '$t'" . ($t?' DUPE':' NEW')) if isdbg('spotdup'); if (isdbg('spottext')) { -- 2.43.0