From: djk <djk>
Date: Sun, 29 Aug 1999 22:13:09 +0000 (+0000)
Subject: remove -@ from spots ssids
X-Git-Tag: R_1_32~26
X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=7c41fe2814a16ad0f7ced2ec5e50f6e8647010f9;p=spider.git

remove -@ from spots ssids
---

diff --git a/Changes b/Changes
index c574a340..74265c58 100644
--- 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 b8ac3ead..c1e83d79 100644
--- 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 5ce5203d..d49c7966 100755
--- 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