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 d3ab1871c438c6ed2f3a1e5adcff97d9c5733edf..be8380c1df0525c18ab69eb6b6d12b274c235344 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -58,12 +58,14 @@ 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
@@ -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