loads of changes and added things

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index f46ef82d80f20f7ad4f7ef3d19d2685f1ce101ae..7db7ae3c9a9ddfe57e67903bdb3f58f2ec61acdc 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -16,8 +16,8 @@ BEGIN {
   $root = "/spider"; 
   $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
 
-  unshift @INC, '$root/perl';  # this IS the right way round!
-  unshift @INC, '$root/local';
+  unshift @INC, "$root/perl";  # this IS the right way round!
+  unshift @INC, "$root/local";
 }
 
 use Msg;
@@ -31,14 +31,18 @@ use DXProt;
 use DXMsg;
 use DXCluster;
 use DXDebug;
+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
@@ -140,7 +144,10 @@ sub process_inqueue
     $dxchan->start($line);  
   } elsif ($sort eq 'D') {
     die "\$user not defined for $call" if !defined $user;
-       $dxchan->normal($line);  
+       
+       # normal input
+       $dxchan->normal($line);
+
     disconnect($dxchan) if ($dxchan->{state} eq 'bye');
   } elsif ($sort eq 'Z') {
     disconnect($dxchan);
@@ -162,6 +169,9 @@ foreach(@debug) {
 }
 STDOUT->autoflush(1);
 
+# banner
+print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
+
 # load Prefixes
 print "loading prefixes ...\n";
 Prefix::load();
@@ -186,9 +196,23 @@ $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); 
 
+# read in any existing message headers
+print "reading existing message headers\n";
+DXMsg->init();
+
+# read in any cron jobs
+print "reading cron jobs\n";
+DXCron->init();
+
 # this, such as it is, is the main loop!
 print "orft we jolly well go ...\n";
 for (;;) {
@@ -204,6 +228,8 @@ for (;;) {
        $ztime = &ztime();
     DXCommandmode::process();     # process ongoing command mode stuff
     DXProt::process();              # process ongoing ak1a pcxx stuff
+       DXCron::process();
+       DXConnect::process();
   }
 }