Revert PC92 A D & C settings

diff --git a/Changes b/Changes
index 802b0cc97fbb7195e08f93dba8de8b2a7c473eaa..629dd0ff2ed9314f08a68c9895f787dd08ffc5d8 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+01Mar23=======================================================================
+1. Revert PC92 A D and PC92 C record flags back to defaults
 28Feb23=======================================================================
 1. Default ip addresses ON in PC92 C records, disable PC92 A D record output.
 2. Add CTY-3308 prefixes.

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 3ddb68fa982b1978969a0578bd1f669d81019c63..9f4f3840242adaa38085bf34c7a01f815a7392ba 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -86,8 +86,8 @@ $pc92_keepalive_period = 1*60*60;     # frequency of PC92 K (keepalive) records
 $pc92_find_timeout = 30;               # maximum time to wait for a reply
 $senderverify = 0;                             # 1 = check spotter is on node it says it is and check ip address if available
 ;                                                              # 2 = do 1 and dump if check
-$pc92_ad_enabled = 0;                  # send pc92 A & D records.
-$pc92c_ipaddr_enable = 1;              # add the local ip address info to each callsign in a PC92 C
+$pc92_ad_enabled = 1;                  # send pc92 A & D records.
+$pc92c_ipaddr_enable = 0;              # add the local ip address info to each callsign in a PC92 C
 
 @checklist =
 (

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 056fd628557a1947706598f54f958358ef5807fb..792aa2e79e122c0ea8de7d777881d2994c0bbcee 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -20,7 +20,7 @@ use Data::Dumper;
 use QSL;
 use DXSql;
 use Time::HiRes qw(gettimeofday tv_interval);
-
+use Math::Round qw(nearest nearest_floor);
 
 use strict;
 
@@ -73,7 +73,11 @@ our %spotcache;                                      # the cache of data within the last $spotcachedays 0 or 2+ d
 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;
+our $readback = $main::is_win ? 0 : 1; # don't read spot files backwards if it's windows
+our $qrggranularity = 100000;  # 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 second 
+our $oldstyle = 0;                             # revert to traditional dupe key format
+
 
 if ($readback) {
        $readback = `which tac`;
@@ -481,7 +485,9 @@ sub dup
        # dump if too old
        return 2 if $d < $main::systime - $dupage;
 
-               # turn the time into minutes (should be already but...)
+       my $nd = nearest_floor($d, $timegranularity);
+
+       # turn the time into minutes (should be already but...)
        $d = int ($d / 60);
        $d *= 60;
 
@@ -490,6 +496,7 @@ sub dup
        
 #      $freq = sprintf "%.1f", $freq;       # normalise frequency
        $freq = int $freq;       # normalise frequency
+       my $qrg = nearest_floor($freq, $qrggranularity); # to the nearest however many hz
        $call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
 
        chomp $text;
@@ -501,7 +508,7 @@ sub dup
        $text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
        $text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure!
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
-       my $ldupkey = "X$|$call|$by|$node|$freq|$d|$text";
+       my $ldupkey = $oldstyle ? "X|$call|$by|$node|$freq|$d|$text" : "X|$call|$by|$qrg|$nd|$text";
 
        my $t = DXDupe::find($ldupkey);
        return 1 if $t && $t - $main::systime > 0;
@@ -510,7 +517,7 @@ sub dup
        $otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
        $otext =~ s/\s+$//;
        if (length $otext && $otext ne $text) {
-               $ldupkey = "X$freq|$call|$by|$otext";
+               $ldupkey = $oldstyle ? "X|$freq|$call|$by|$otext" : "X|$qrg|$call|$by|$otext";
                $t = DXDupe::find($ldupkey);
                return 1 if $t && $t - $main::systime > 0;
                DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;