X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FGeomag.pm;h=9b4421d821cb10c4b2db24277536d28eba6ec1db;hb=eba7370bb0458ae84b4815f30494a7c389008d0e;hp=022c4519e6c7928f72f1ff616d632a16288b37d6;hpb=7bf828b924d7d1ddc7c81e65d816bdc36f55a92f;p=spider.git

diff --git a/perl/Geomag.pm b/perl/Geomag.pm
index 022c4519..9b4421d8 100644
--- a/perl/Geomag.pm
+++ b/perl/Geomag.pm
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Geomag;
@@ -20,12 +20,6 @@ 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,9 +38,13 @@ $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', 0],
@@ -64,6 +62,10 @@ sub init
 {
 	$fp = DXLog::new('wwv', 'dat', 'm');
 	do "$param" if -e "$param";
+	# read in existing data
+	@cache = readfile($main::systime);
+	shift @cache while @cache > $maxcache;	
+	dbg(sprintf "WWV read in last %d records into cache", scalar @cache);	
 	confess $@ if $@;
 }
 
@@ -85,7 +87,10 @@ 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)
@@ -98,7 +103,7 @@ sub update
 		(@allowed == 0 && @denied == 0)) {
 		
 		#	my $trydate = cltounix($mydate, sprintf("%02d18Z", $mytime));
-		if ($mydate >= $date) {
+		if ($mydate > $date) {
 			if ($myr) {
 				$r = 0 + $myr;
 			} else {
@@ -183,15 +188,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--) {
@@ -205,22 +217,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;