put duplicate checking into respective modules and out of DXProt.

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7b5bf6f46b95a55728789e00728bfd61eab0c6c1..be8380c1df0525c18ab69eb6b6d12b274c235344 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -58,17 +58,19 @@ use Bands;
 use Geomag;
 use CmdAlias;
 use Filter;
-use Local;
 use DXDb;
-use Data::Dumper;
+use AnnTalk;
 
+use Data::Dumper;
 use Fcntl ':flock'; 
 
+use Local;
+
 package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.40";                             # the version no of the software
+$version = "1.41";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
 @outstanding_connects = ();     # list of outstanding connects
@@ -238,7 +240,7 @@ sub process_inqueue
        
        my $data = $self->{data};
        my $dxchan = $self->{dxchan};
-       my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
+       my ($sort, $call, $line) = $data =~ /^(\w)([^\|]+)\|(.*)$/;
        my $error;
        
        # the above regexp must work
@@ -299,7 +301,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-2000 Dirk Koopman G1TLH");
 
 # load Prefixes
 dbg('err', "loading prefixes ...");
@@ -368,7 +370,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");