remove -@ from spots ssids

diff --git a/Changes b/Changes
index c574a3405440c8b119351855f373de3d631e2b97..74265c58f62169b9f0c8ee5356fdd7025358033f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+30Aug99=======================================================================
+1. remove -@ as well as \d from SSIDs for spots
 29Aug99=======================================================================
 1. Added msg command to allow the changing of To, From, Subject and so on the
 messages. This seems particularly important just now as a whole raft of G3's

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b8ac3ead62ddc313c35edf2ef04fb91d220ffba2..c1e83d7907633558f95349df709f8d5cc9b55f18 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -210,7 +210,7 @@ sub normal
                        
                        # store it away
                        my $spotter = $field[6];
-                       $spotter =~ s/-\d+$//o; # strip off the ssid from the spotter
+                       $spotter =~ s/-[\@\d]+$//o;     # strip off the ssid from the spotter
                        
                        # do some de-duping
                        my $freq = $field[1] - 0;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5ce5203ddf43c90edeedcaf9538446f3490d0bdf..d49c7966f96001d8750d5ca3bfd3e99194ef0433 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -67,7 +67,7 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.31";                             # the version no of the software
+$version = "1.32";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name