X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=bed8bd20297372fbca7e14233942e1c68029fb77;hb=c83b1ca22765fc07e5adcdc8dac24cbd066c9b95;hp=8b703306e25e0f1b94f86c1bbbddabca0a2a70e1;hpb=86d0e8cc034db0b0d23afc09b6f596c38a57885d;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 8b703306..bed8bd20 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -18,6 +18,8 @@ use Prefix;
 use DXDupe;
 use Data::Dumper;
 use QSL;
+use DXSql;
+use Julian;
 
 use strict;
 
@@ -41,17 +43,20 @@ $filterdef = bless ([
 					 ['info', 't', 3],
 					 ['spotter', 'c', 4],
 					 ['by', 'c', 4],
+					 ['dxcc', 'nc', 5],
 					 ['call_dxcc', 'nc', 5],
 					 ['by_dxcc', 'nc', 6],
 					 ['origin', 'c', 7, 9],
 					 ['call_itu', 'ni', 8],
 					 ['itu', 'ni', 8],
 					 ['call_zone', 'nz', 9],
+					 ['cq', 'nz', 9],
 					 ['zone', 'nz', 9],
 					 ['by_itu', 'ni', 10],
 					 ['byitu', 'ni', 10],
 					 ['by_zone', 'nz', 11],
 					 ['byzone', 'nz', 11],
+					 ['bycq', 'nz', 11],
 					 ['call_state', 'ns', 12],
 					 ['state', 'ns', 12],
 					 ['by_state', 'ns', 13],
@@ -63,7 +68,11 @@ $filterdef = bless ([
 $totalspots = $hfspots = $vhfspots = 0;
 $use_db_for_search = 0;
 
-our $readback = 0;
+our %spotcache;					# the cache of data within the last $spotcachedays 0 or 2+ days
+our $spotcachedays = 0;
+
+
+our $readback = 1;
 
 if ($readback) {
 	$readback = `which tac`;
@@ -88,7 +97,7 @@ sub decodefreq
 	
 	foreach $f (@f) {
 		my ($a, $b); 
-		if (m{^\d+/\d+$}) {
+		if ($f =~ m{^\d+/\d+$}) {
 			push @out, $f;
 		} elsif (($a, $b) = $f =~ m{^(\w+)(?:/(\w+))?$}) {
 			$b = lc $b if $b;
@@ -121,6 +130,7 @@ sub init
 	mkdir "$dirprefix", 0777 if !-e "$dirprefix";
 	$fp = DXLog::new($dirprefix, "dat", 'd');
 	$statp = DXLog::new($dirprefix, "dys", 'd');
+	my $today = Julian::Day->new(time);
 
 	# load up any old spots 
 	if ($main::dbh) {
@@ -131,7 +141,6 @@ sub init
 			$main::dbh->spot_create_table;
 			
 			my $now = Julian::Day->alloc(1995, 0);
-			my $today = Julian::Day->new(time);
 			my $sth = $main::dbh->spot_insert_prepare;
 			while ($now->cmp($today) <= 0) {
 				my $fh = $fp->open($now);
@@ -174,6 +183,34 @@ sub init
 			dbg("added ipaddr field to spot table");
 		}
 	}
+
+	# initialise the cache if required
+	if ($spotcachedays) {
+		$spotcachedays = 2 if $spotcachedays < 2;
+		my $now = $today->sub($spotcachedays);
+		while ($now->cmp($today) >= 0) {
+			my $fh = $fp->open($now);
+			if ($fh) {
+				my @in;
+				while (<$fh>) {
+					chomp;
+					my @s = split /\^/;
+					if (@s < 14) {
+						my @a = (Prefix::cty_data($s[1]))[1..3];
+						my @b = (Prefix::cty_data($s[4]))[1..3];
+						push @s, $b[1] if @s < 7;
+						push @s, '' if @s < 8;
+						push @s, @a[0,1], @b[0,1] if @s < 12;
+						push @s,  $a[2], $b[2] if @s < 14;
+					}
+					push @in, \@s; 
+				}
+				$fh->close;
+				$spotcache{"$now->[0]|$now->[1]"} = \@in;
+			}
+			$now->add(1);
+		}
+	}
 }
 
 sub prefix
@@ -217,6 +254,19 @@ sub add
 {
 	my $buf = join('^', @_);
 	$fp->writeunix($_[2], $buf);
+	if ($spotcachedays) {
+		my $now = Julian::Day->new($_[2]);
+		my $day = "$now->[0]|$now->[1]";
+		my $r = exists $spotcache{$day} ? $spotcache{$day} : $spotcache{$day} = [];
+		unshift @$r, @_;
+
+		# remove old days
+		while (keys %spotcache > $spotcachedays+1) {
+			while (sort keys %spotcache > $spotcachedays+1) {
+				delete $spotcache{$_};
+			}
+		}
+	}
 	if ($main::dbh) {
 		$main::dbh->begin_work;
 		$main::dbh->spot_insert(\@_);
@@ -267,7 +317,7 @@ sub add
 
 sub search
 {
-	my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_;
+	my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan) = @_;
 	my @out;
 	my $ref;
 	my $i;
@@ -289,7 +339,7 @@ sub search
 	$to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0;
 
 	if ($main::dbh && $use_db_for_search) {
-		return $main::dbh->spot_search($hint, $dayfrom, $dayto, $to-$from, $dxchan);
+		return $main::dbh->spot_search($expr, $dayfrom, $dayto, $from, $to, $hint, $dofilter, $dxchan);
 	}
 
 	#	$expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name
@@ -309,12 +359,14 @@ sub search
 	
 	my $fh;
 	my $now = $fromdate;
-	my @spots;
-	my $recs;
+	my $today = Julian::Day->new($main::systime);
 	
 	for ($i = $count = 0; $count < $to && $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
 		last if $now->cmp($todate) <= 0;
-		
+
+		if ($spotcachedays) {
+			
+		}
 		my $fn = $fp->fn($now->sub($i));
 		if ($readback) {
 			dbg("Spot::search search using tac fn: $fn $i") if isdbg('search');
@@ -328,9 +380,10 @@ sub search
 			my $rec = 0;
 			my $in;
 			while (<$fh>) {
+				chomp;
 				my @r = split /\^/;
 				++$rec;
-				if ($dxchan) {
+				if ($dofilter && $dxchan && $dxchan->{spotsfilter}) {
 					my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r);
 					next unless $gotone;
 				}