X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmrtg.pl;h=4f0214e9110e91050d70fa3bf2b5146f77398f84;hb=c32170b5b05416143021fb165a27072ce861350b;hp=0cb0f501ed90b3bf8fbf3fd5ebb8ce180e53c863;hpb=8a75f069df30fae5d585be1d9828e03d1220583e;p=spider.git

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index 0cb0f501..4f0214e9 100644
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -13,6 +13,7 @@
 #    hfvhf            - all spots split into HF and VHF
 #    wwv              - two graphs of WWV, one SFI and R other A and K
 #    wcy              - WCY A and K 
+#    pc92             - PC92 C and K, PC92 A and D
 #    all              - all of the above 
 #    
 # b) actions          
@@ -25,7 +26,7 @@
 #
 # Copyright (c) 2002 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -71,6 +72,7 @@ if (!$main::is_win && ($want{proc} || $want{all})) {
 			my $l = $_;
 #			dbg($l);
 			next unless $l =~ m{cluster\.pl$};
+			next if $l =~ m{bash\s+\-c};
 			my @f = split /\s+/, $l;
 #			dbg("$f[9]");
 			my ($m, $s) = split /:/, $f[9];
@@ -110,7 +112,7 @@ if ($want{totalusers} || $want{all}) {
 if ($want{totalspots} || $want{all}) {
 	$mc->cfgprint('totalspots',  [qw(unknaszero gauge noi)], 1000, 'Total Spots',
 			 'Spots / min', 'Spots', 'Spots') unless $want{dataonly};
-	$mc->data('totalspots', $Spot::totalspots, $Spot::totalspots, 'Total Spots') unless $want{cfgonly};
+	$mc->data('totalspots', int ($Spot::totalspots/5+0.5), int($Spot::totalspots/5+0.5), 'Total Spots') unless $want{cfgonly};
 	$Spot::totalspots = 0;
 }
 
@@ -118,14 +120,14 @@ if ($want{totalspots} || $want{all}) {
 if ($want{hfvhf} || $want{all}) {
 	$mc->cfgprint('hfspots', [qw(unknaszero gauge)], 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};
+	$mc->data('hfspots', int($Spot::hfspots/5+0.5), int($Spot::vhfspots/5+0.5), 'HF and VHF+ Spots') unless $want{cfgonly};
 	$Spot::hfspots = $Spot::vhfspots = 0;
 }
 
 # wwv stuff
 if ($want{wwv} || $want{all}) {
 	$mc->cfgprint('wwvsfi', [qw(gauge)], 1000, 'WWV <font color=#00cc00>SFI</font> and <font color=#0000ff>R</font>', 'SFI / R', 'SFI', 'R') unless $want{dataonly};
-	$mc->data('wwvsfi', ($Geomag::r || $WCY::r), ($Geomag::sfi || $WCY::sfi), 'WWV SFI and R') unless $want{cfgonly};
+	$mc->data('wwvsfi', ($Geomag::sfi || $WCY::sfi), ($Geomag::r || $WCY::r), 'WWV SFI and R') unless $want{cfgonly};
 	$mc->cfgprint('wwvka', [qw(gauge)], 1000, 'WWV <font color=#00cc00>A</font> and <font color=#0000ff>K</font>',
 			 'A / K', 'A', 'K') unless $want{dataonly};
 	$mc->data('wwvka', $Geomag::a, $Geomag::k, 'WWV A and K') unless $want{cfgonly};
@@ -138,8 +140,30 @@ if ($want{wcy} || $want{all}) {
 	$mc->data('wcyka', $WCY::a, $WCY::k, 'WCY A and K') unless $want{cfgonly};
 }
 
+if ($want{pc92} || $want{all}) {
+
+	$mc->cfgprint('pc92ck', [], 1024000,
+				  "PC92 <font color=#00cc00>C</font> and <font color=#0000ff>K</font> records into $main::mycall",
+				  'Bytes / Sec', 'C', 'K') unless $want{dataonly};
+	$mc->data('pc92ck', $DXProt::pc92Cin, $DXProt::pc92Kin, "PC92 C and K into $main::mycall") unless $want{cfgonly};
+#	$DXProt::pc92C = $DXProt::pc92K = 0;
+
+	$mc->cfgprint('pc92ad', [], 1024000,
+				  "PC92 <font color=#00cc00>A</font> and <font color=#0000ff>D</font> records into $main::mycall",
+				  'Bytes / Sec', 'A', 'D') unless $want{dataonly};
+	$mc->data('pc92ad', $DXProt::pc92Ain, $DXProt::pc92Din, "PC92 A and D into $main::mycall") unless $want{cfgonly};
+#	$DXProt::pc92A = $DXProt::pc92D = 0;
+
+}
+
 # 
 # do the mrtg thing
 #
-my @out = $mc->run unless $want{nomrtg};
+
+my @out;
+{
+local %ENV;
+$ENV{LANG} = 'C';
+@out = $mc->run unless $want{nomrtg};
+}
 return (1, @out);