X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FGeomag.pm;h=ca16e363f445536b19a356d56652affa852c6774;hb=a565e3b0349dfe4f82233fa30c7dc1ae09ff028a;hp=d78ff2cd3f007fd67cd7b5233ec3db33551ff699;hpb=0542c1871c9563b7577a4b9a1282fd5d2c203047;p=spider.git

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index d78ff2cd..ca16e363 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -15,7 +15,7 @@ use DXUtil;
 use DXLog;
 use Julian;
 use IO::File;
-use Carp;
+use DXDebug;
 
 use strict;
 use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from);
@@ -73,8 +73,12 @@ sub update
 		
 		#	my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
 		if ($mydate >= $date) {
+			if ($myr) {
+				$r = 0 + $myr;
+			} else {
+				$r = 0 unless abs ($mysfi - $sfi) > 3;
+			}
 			$sfi = 0 + $mysfi;
-            $r = 0 + $myr unless !$r && $myk == $k;
 			$k = 0 + $myk;
 			$a = 0 + $mya;
 			$forecast = $myforecast;