fix allow 2/more commands on a line

[spider.git] / perl / Geomag.pm

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index 6b6d778dbeb62bae791722688f5728d17018df99..f8a1ec720c0d820f9c82ee1e3eee9635098b57e2 100644 (file)
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Geomag;
@@ -17,8 +17,10 @@ use Julian;
 use IO::File;
 use DXDebug;
 use DXDupe;
+use Time::HiRes qw(gettimeofday tv_interval);
 
 use strict;
+
 use vars qw($date $sfi $k $a $r $forecast @allowed @denied $fp $node $from 
             $dirprefix $param
             $duplth $dupage $filterdef);
@@ -37,26 +39,36 @@ $from = "";                                         # who this came from
 $duplth = 20;                                  # the length of text to use in the deduping
 $dupage = 12*3600;                             # the length of time to hold spot dups
 
-$dirprefix = "$main::data/wwv";
+$dirprefix = "$main::local_data/wwv";
 $param = "$dirprefix/param";
 
+our $maxcache = 10;
+our @cache;
+
+
 $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],
+                         ['by', 'c', 0],
+                         ['origin', 'c', 1],
+                         ['channel', 'c', 2],
+                         ['by_dxcc', 'nc', 3],
+                         ['by_itu', 'ni', 4],
+                         ['by_zone', 'nz', 5],
+                         ['origin_dxcc', 'nc', 6],
+                         ['origin_itu', 'ni', 7],
+                         ['origin_zone', 'nz', 8],
                         ], 'Filter::Cmd');
 
 sub init
 {
        $fp = DXLog::new('wwv', 'dat', 'm');
        do "$param" if -e "$param";
+       # read in existing data
+       my $t0 = [gettimeofday];
+       dbg(sprintf "WWV read in upto %d records into cache", $maxcache);       
+       @cache = readfile($main::systime);
+       shift @cache while @cache > $maxcache;  
+       dbg(sprintf "WWV read in last %d records into cache in %dmS", scalar @cache, _diffms($t0));     
        confess $@ if $@;
 }
 
@@ -78,19 +90,23 @@ sub store
        close $fh;
        
        # log it
-       $fp->writeunix($date, "$from^$date^$sfi^$a^$k^$forecast^$node^$r");
+       my $s ="$from^$date^$sfi^$a^$k^$forecast^$node^$r";
+       $fp->writeunix($date, $s);
+       push @cache, [ split /\^/, $s ];
+       shift @cache while @cache > $maxcache; 
 }
 
 # update WWV info in one go (usually from a PC23)
 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));
-               if ($mydate >= $date) {
+               if ($mydate > $date) {
                        if ($myr) {
                                $r = 0 + $myr;
                        } else {
@@ -175,15 +191,22 @@ sub search
 {
        my $from = shift;
        my $to = shift;
-       my @date = $fp->unixtoj(shift);
+       my $t = shift;
+       my $date = $fp->unixtoj($t);
        my $pattern = shift;
        my $search;
        my @out;
        my $eval;
        my $count;
-       
-       $search = 1;
-       $eval = qq(
+
+       if ($t == $main::systime && ($to <= $maxcache)) {
+               dbg("using wwv cache") if isdbg('wwv');
+               @out = reverse @cache;
+               pop @out while @out > $to;
+       } else {
+               dbg("using wwv file(s))") if isdbg('wwv');
+               $search = 1;
+               $eval = qq(
                           my \$c;
                           my \$ref;
                           for (\$c = \$#in; \$c >= 0; \$c--) {
@@ -197,22 +220,23 @@ sub search
                                }
                          );
        
-       $fp->close;                                     # close any open files
-       
-       my $fh = $fp->open(@date); 
-       for ($count = 0; $count < $to; ) {
-               my @in = ();
-               if ($fh) {
-                       while (<$fh>) {
-                               chomp;
-                               push @in, [ split '\^' ] if length > 2;
+               $fp->close;                                     # close any open files
+               
+               my $fh = $fp->open($date); 
+               for ($count = 0; $count < $to; ) {
+                       my @in = ();
+                       if ($fh) {
+                               while (<$fh>) {
+                                       chomp;
+                                       push @in, [ split '\^' ] if length > 2;
+                               }
+                               eval $eval;                     # do the search on this file
+                               return ("Geomag search error", $@) if $@;
+                               last if $count >= $to; # stop after n
                        }
-                       eval $eval;                     # do the search on this file
-                       return ("Geomag search error", $@) if $@;
-                       last if $count >= $to; # stop after n
+                       $fh = $fp->openprev();  # get the next file
+                       last if !$fh;
                }
-               $fh = $fp->openprev();  # get the next file
-               last if !$fh;
        }
        
        return @out;
@@ -243,8 +267,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;
        
@@ -260,12 +284,12 @@ sub readfile
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-       my ($d, $sfi, $k, $a, $text) = @_; 
+       my ($d, $sfi, $k, $a, $text, $call) = @_; 
 
        # dump if too old
        return 2 if $d < $main::systime - $dupage;
  
-       my $dupkey = "W$d|$sfi|$k|$a";
+       my $dupkey = "W$d|$sfi|$k|$a|$call";
        return DXDupe::check($dupkey, $main::systime+$dupage);
 }