X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FGeomag.pm;h=e74f50218f16f6b332a575d4d2eeba673611c67d;hb=70fdef0395640e4bfcfef08bc9a59d3a6b1f7bd9;hp=8f17eaf32000442462ca1bd1bbbf840e4e942dd9;hpb=6ccc3a6e864a2fee18786a7070400c7c4f22cf7c;p=spider.git

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index 8f17eaf3..e74f5021 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -22,7 +22,7 @@ use strict;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -92,8 +92,9 @@ sub store
 sub update
 {
 	my ($mydate, $mytime, $mysfi, $mya, $myk, $myforecast, $myfrom, $mynode, $myr) = @_;
-	if ((@allowed && grep {$_ eq $from} @allowed) || 
-		(@denied && !grep {$_ eq $from} @denied) ||
+	$myfrom =~ s/-\d+$//;
+	if ((@allowed && grep {$_ eq $myfrom} @allowed) || 
+		(@denied && !grep {$_ eq $myfrom} @denied) ||
 		(@allowed == 0 && @denied == 0)) {
 		
 		#	my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));