X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=7db7ae3c9a9ddfe57e67903bdb3f58f2ec61acdc;hb=6a0068ec3df1dca0c6ae2714af3c0a4a62998dcf;hp=f1759ef5a01e80a178d2210206081afa50ca5409;hpb=78ed3f6025103ec1c47c90725e37b417647d83c8;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index f1759ef5..7db7ae3c 100755
--- 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;
@@ -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);
@@ -170,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();
@@ -194,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);