loads of changes and added things

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 9511435d72200b4b3cb3f76c726383dcc57882ab..7db7ae3c9a9ddfe57e67903bdb3f58f2ec61acdc 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -35,12 +35,14 @@ use DXCron;
 use DXConnect;
 use Prefix;
 use Bands;
+use Geomag;
+use Carp;
 
 package main;
 
 @inqueue = ();                # the main input queue, an array of hashes
 $systime = 0;                 # the time now (in seconds)
-$version = 1.1;               # the version no of the software
+$version = 1.2;               # the version no of the software
 
 # handle disconnections
 sub disconnect
@@ -142,13 +144,10 @@ sub process_inqueue
     $dxchan->start($line);  
   } elsif ($sort eq 'D') {
     die "\$user not defined for $call" if !defined $user;
-       if ($dxchan->{func}) {   
-         # call an ongoing routine if there is a function specified
-         &{$dxchan->{func}} ($dxchan, $line);
-       } else {
-         # normal input
-         $dxchan->normal($line);
-       }
+       
+       # normal input
+       $dxchan->normal($line);
+
     disconnect($dxchan) if ($dxchan->{state} eq 'bye');
   } elsif ($sort eq 'Z') {
     disconnect($dxchan);
@@ -197,6 +196,12 @@ $SIG{'HUP'} = 'IGNORE';
 # initialise the protocol engine
 DXProt->init();
 
+# initialise the Geomagnetic data engine
+Geomag->init();
+
+# initial the Spot stuff
+Spot->init();
+
 # put in a DXCluster node for us here so we can add users and take them away
 DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);