X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FGeomag.pm;h=8f17eaf32000442462ca1bd1bbbf840e4e942dd9;hb=f415973f5f2afa49403e76a1fc1dec29a71be950;hp=037dcc50be74637e6d4721f962066789dd3b6106;hpb=44bab9382ffb0bf12639af84729d1c42ac4d9ae2;p=spider.git

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index 037dcc50..8f17eaf3 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -19,9 +19,16 @@ 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;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
 use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from 
             $dirprefix $param
-            $duplth $dupage);
+            $duplth $dupage $filterdef);
 
 $fp = 0;						# the DXLog fcb
 $date = 0;						# the unix time of the WWV (notional)
@@ -40,6 +47,19 @@ $dupage = 12*3600;				# the length of time to hold spot dups
 $dirprefix = "$main::data/wwv";
 $param = "$dirprefix/param";
 
+$filterdef = bless ([
+			  # tag, sort, field, priv, special parser 
+			  ['by', 'c', 7],
+			  ['origin', 'c', 8],
+			  ['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
 {
 	$fp = DXLog::new('wwv', 'dat', 'm');
@@ -162,7 +182,7 @@ sub search
 {
 	my $from = shift;
 	my $to = shift;
-	my @date = $fp->unixtoj(shift);
+	my $date = $fp->unixtoj(shift);
 	my $pattern = shift;
 	my $search;
 	my @out;
@@ -186,7 +206,7 @@ sub search
 	
 	$fp->close;					# close any open files
 	
-	my $fh = $fp->open(@date); 
+	my $fh = $fp->open($date); 
 	for ($count = 0; $count < $to; ) {
 		my @in = ();
 		if ($fh) {
@@ -230,8 +250,8 @@ sub print_item
 #
 sub readfile
 {
-	my @date = $fp->unixtoj(shift);
-	my $fh = $fp->open(@date); 
+	my $date = $fp->unixtoj(shift);
+	my $fh = $fp->open($date); 
 	my @spots = ();
 	my @in;