some cosmetic changes

diff --git a/Changes b/Changes
index cd9300de04c1f6241ca7501960883d927b6ee69b..6735951608268d96538f151f9992d565f61f71e5 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,6 +5,9 @@ everywhere and checked that the necessary debugging really does go into
 the debug files now.
 3. changed print statements in cluster.pl to dbg('err',... so they go into
 the debug files as well.
+4. Altered the logic around duplicate spots, reduced the length of comment
+checked to 20 characters (this should solve some problems including those
+people sucking ar-cluster spots with prefixes in the extreme lh end). 
 08Jun00=======================================================================
 1. fixed problem with binary characters from cluster->client
 2. added set/echo and unset/echo commands

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 256eb9c76235c141d1810b423e744f5b55670739..ecb6cfc638edad38d15fc4b509fb838cc748b595 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -41,7 +41,7 @@ $pc11_dup_age = 3*3600;                       # the maximum time to keep the spot dup list for
 $pc23_dup_age = 3*3600;                        # the maximum time to keep the wwv dup list for
 $pc12_dup_age = 24*3600;               # the maximum time to keep the ann dup list for
 $pc12_dup_lth = 60;                            # the length of ANN text to save for deduping 
-$pc11duptext = 27;                             # maximum lth of the text field in PC11 to use for duduping
+$pc11duptext = 20;                             # maximum lth of the text field in PC11 to use for duduping
 
 %spotdup = ();                             # the pc11 and 26 dup hash 
 %wwvdup = ();                              # the pc23 and 27 dup hash
@@ -72,15 +72,15 @@ sub init
        @today = Julian::sub(@today, 1);
        push @spots, Spot::readfile(@today);
        for (@spots) {
-               my $dupkey = "$_->[0]$_->[1]$_->[2]$_->[3]$_->[4]";
+               my $duptext = length $_->[3] > $pc11duptext ? substr($_->[3], 0, $pc11duptext) : $_->[3] ;
+               my $dupkey = "$_->[0]$_->[1]$_->[2]$duptext$_->[4]";
                $spotdup{$dupkey} = $_->[2];
        }
 
        # now prime the wwv duplicates file with just this month's data
        my @wwv = Geomag::readfile(time);
        for (@wwv) {
-               my $duptext = substr $_->[3], 0, $pc11duptext;
-               my $dupkey = "$_->[1].$_->[2]$duptext$_->[4]";
+               my $dupkey = "$_->[1].$_->[2]$_->[3]$_->[4]";
                $wwvdup{$dupkey} = $_->[1];
        }
 
@@ -231,6 +231,7 @@ sub normal
                        }
 
                        # strip off the leading & trailing spaces from the comment
+                       my $duptext = length $field[5] > $pc11duptext ? substr($field[5], 0, $pc11duptext) : $field[5];
                        my $text = unpad($field[5]);
                        
                        # store it away
@@ -239,8 +240,7 @@ sub normal
                        
                        # do some de-duping
                        my $freq = $field[1] - 0;
-                       my $duptext = substr $text, 0, $pc11duptext;
-                       my $dupkey = "$freq$field[2]$d$duptext$spotter";
+                       my $dupkey = "$freq$field[2]$d$text$spotter";
                        if ($spotdup{$dupkey}) {
                                dbg('chan', "Duplicate Spot ignored\n");
                                return;

diff --git a/perl/client.pl b/perl/client.pl
index 6327ee5fd1c86ac61f648a033755c28a545d9e1f..91d4add615bf049cc2fbaa3380c0c99437878a83 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -147,7 +147,13 @@ sub rec_socket
                        $buffered = $line;      # set buffered or unbuffered
                } elsif ($sort eq 'Z') { # end, disconnect, go, away .....
                        cease(0);
-               }         
+               } 
+
+               # ******************************************************
+               # ******************************************************
+               # any other sorts that might happen are silently ignored.
+               # ******************************************************
+               # ******************************************************
        }
        $lasttime = time; 
 }

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7b5bf6f46b95a55728789e00728bfd61eab0c6c1..9f03281f998385deb11d0f3b326374d0230a42d1 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -299,7 +299,7 @@ STDOUT->autoflush(1);
 Log('cluster', "DXSpider V$version started");
 
 # banner
-dbg('err', "DXSpider DX Cluster Version $version\nCopyright (c) 1998-1999 Dirk Koopman G1TLH");
+dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-1999 Dirk Koopman G1TLH");
 
 # load Prefixes
 dbg('err', "loading prefixes ...");
@@ -368,7 +368,6 @@ dbg('local', "Local::init error $@") if $@;
 
 # this, such as it is, is the main loop!
 dbg('err', "orft we jolly well go ...");
-Log('err', "DXSpider version $version started...");
 
 #open(DB::OUT, "|tee /tmp/aa");
 

diff --git a/perl/console.pl b/perl/console.pl
index 5fd965ee8f1da9f0d3a950daed7036531d214495..bc3f3a9f40309e4dc8cd50d84b724e953755b1ba 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -221,6 +221,11 @@ sub rec_socket
                } elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
                        cease(0);
                }         
+               # ******************************************************
+               # ******************************************************
+               # any other sorts that might happen are silently ignored.
+               # ******************************************************
+               # ******************************************************
        }
        $top->refresh();
        $lasttime = time;