From: Dirk Koopman <djk@tobit.co.uk>
Date: Tue, 25 Sep 2007 18:11:57 +0000 (+0100)
Subject: change the type of unit for spots
X-Git-Tag: 1.55~61
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=9549aeeb927ca0deb3cac4d06241f4dc4a054bb1

change the type of unit for spots

This is an attempt to see if we now get the correct no of spots / minute
---

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 93adf332..0d027b9a 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -109,7 +109,7 @@ if ($want{totalusers} || $want{all}) {
 
 # do the total spots
 if ($want{totalspots} || $want{all}) {
-	$mc->cfgprint('totalspots',  [qw(unknaszero gauge noi)], 1000, 'Total Spots',
+	$mc->cfgprint('totalspots',  [qw(unknaszero absolute noi)], 1000, 'Total Spots',
 			 'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
 	$mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
 	$Spot::totalspots = 0;
@@ -117,7 +117,7 @@ if ($want{totalspots} || $want{all}) {
 
 # do the HF and VHF spots
 if ($want{hfvhf} || $want{all}) {
-	$mc->cfgprint('hfspots', [qw(unknaszero gauge)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
+	$mc->cfgprint('hfspots', [qw(unknaszero absolute)], 1000, '<font color=#00cc00>HF</font> and <font color=#0000ff>VHF+</font> Spots',
 			 'Spots / min', 'HF', 'VHF') unless $want{dataonly};
 	$mc->data('hfspots', $Spot::hfspots, $Spot::vhfspots, 'HF and VHF+ Spots') unless $want{cfgonly};
 	$Spot::hfspots = $Spot::vhfspots = 0;
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 1288165e..9903ceb4 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -510,8 +510,8 @@ sub process
 
 		# do the keepalive for me, if required
 		if ($main::systime >= $main::me->{next_pc92_keepalive}) {
-			$main::me->broadcast_pc92_keepalive($main::mycall);
 			time_out_pc92_routes();
+			$main::me->broadcast_pc92_keepalive($main::mycall);
 		}
 
 		if ($pc92_slug_changes && $main::systime >= $last_pc92_slug + $pc92_slug_changes) {
diff --git a/perl/Version.pm b/perl/Version.pm
index d5140282..d6880a32 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '153';
+$build = '154';
 
 1;