X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FWCY.pm;h=bccf815b92f82556e07873471754a138d73c9039;hb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;hp=f3202dd4c7451dbe536385dd20a672bccffc37a2;hpb=44bab9382ffb0bf12639af84729d1c42ac4d9ae2;p=spider.git

diff --git a/perl/WCY.pm b/perl/WCY.pm
index f3202dd4..bccf815b 100644
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -18,9 +18,16 @@ use DXDebug;
 use Data::Dumper;
 
 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 $expk $a $r $sa $gmf $au  @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)
@@ -41,6 +48,20 @@ $dupage = 12*3600;				# the length of time to hold spot dups
 $dirprefix = "$main::data/wcy";
 $param = "$dirprefix/param";
 
+$filterdef = bless ([
+			  # tag, sort, field, priv, special parser 
+			  ['by', 'c', 11],
+			  ['origin', 'c', 12],
+			  ['channel', 'n', 13],
+			  ['by_dxcc', 'n', 14],
+			  ['by_itu', 'n', 15],
+			  ['by_zone', 'n', 16],
+			  ['origin_dxcc', 'c', 17],
+			  ['origin_itu', 'c', 18],
+			  ['origin_itu', 'c', 19],
+			 ], 'Filter::Cmd');
+
+
 sub init
 {
 	$fp = DXLog::new('wcy', 'dat', 'm');
@@ -136,12 +157,13 @@ 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;
 	my $eval;
 	my $count;
+	my $i;
 	
 	$search = 1;
 	$eval = qq(
@@ -159,9 +181,8 @@ sub search
 			  );
 	
 	$fp->close;					# close any open files
-	
-	my $fh = $fp->open(@date); 
-	for ($count = 0; $count < $to; ) {
+	my $fh = $fp->open($date); 
+	for ($i = $count = 0; $count < $to; $i++ ) {
 		my @in = ();
 		if ($fh) {
 			while (<$fh>) {
@@ -195,7 +216,7 @@ sub print_item
 	my $d = cldate($r->[0]);
 	my $t = (gmtime($r->[0]))[2];
 
-	return sprintf("$d   %02d %5d %3d %3d   %3d %3d %-5s %-5s     %-3s <%s>", 
+	return sprintf("$d   %02d %5d %3d %3d   %3d %3d %-5s %-5s %6s <%s>", 
 				    $t, @$r[1..9]);
 }
 
@@ -204,8 +225,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;