get all the debugging finally into the debug files when things go wrong

[spider.git] / perl / Geomag.pm

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index d78ff2cd3f007fd67cd7b5233ec3db33551ff699..ca16e363f445536b19a356d56652affa852c6774 100644 (file)
--- 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;