1. protect against PC41s with field[3] == field[2]

[spider.git] / perl / WCY.pm

diff --git a/perl/WCY.pm b/perl/WCY.pm
index f3202dd4c7451dbe536385dd20a672bccffc37a2..7f19ccfd1263c007fb2157d44ec55a1dd4d2c9a5 100644 (file)
--- a/perl/WCY.pm
+++ b/perl/WCY.pm
@@ -20,7 +20,7 @@ use Data::Dumper;
 use strict;
 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 +41,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 +150,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 +174,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 +209,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 +218,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;