X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FGeomag.pm;h=e74f50218f16f6b332a575d4d2eeba673611c67d;hb=0e1727bfb23ddea7bc272776b5b5c4f9c432e65f;hp=e00dbd9e47a268b40f694ad0f6276c1c8f51b40c;hpb=f0910da57e166acb22e83de4e4b771d175074c80;p=spider.git

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index e00dbd9e..e74f5021 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -19,6 +19,13 @@ use DXDebug;
 use DXDupe;
 
 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,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from 
             $dirprefix $param
             $duplth $dupage $filterdef);
@@ -44,13 +51,13 @@ $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['by', 'c', 7],
 			  ['origin', 'c', 8],
-			  ['channel', 'n', 9],
-			  ['by_dxcc', 'n', 10],
-			  ['by_itu', 'n', 11],
-			  ['by_zone', 'n', 12],
-			  ['origin_dxcc', 'c', 13],
-			  ['origin_itu', 'c', 14],
-			  ['origin_itu', 'c', 15],
+			  ['channel', 'c', 9],
+			  ['by_dxcc', 'nc', 10],
+			  ['by_itu', 'ni', 11],
+			  ['by_zone', 'nz', 12],
+			  ['origin_dxcc', 'nc', 13],
+			  ['origin_itu', 'ni', 14],
+			  ['origin_zone', 'nz', 15],
 			 ], 'Filter::Cmd');
 
 sub init
@@ -85,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));