X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=7f6265aca805c3fea907e9fdc19361b71d8ec7c6;hb=b1c75fc83d3dd1d82a2022f6ace2cc20ced19194;hp=27b82b381d45fa851af0f32123256b5344157f1a;hpb=b06fd1d447d5411d8d441e807f93efa897b68aaf;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 27b82b38..7f6265ac 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -70,8 +70,8 @@ $totalspots = $hfspots = $vhfspots = 0;
 $use_db_for_search = 0;
 
 our %spotcache;					# the cache of data within the last $spotcachedays 0 or 2+ days
-our $spotcachedays = 0;
-
+our $spotcachedays = 2;			# default 2 days worth
+our $minselfspotqrg = 1240000;	# minimum freq above which self spotting is allowed
 
 our $readback = 1;
 
@@ -186,7 +186,7 @@ sub init
 	}
 
 	# initialise the cache if required
-	if ($spotcachedays) {
+	if ($spotcachedays > 0) {
 		my $t0 = [gettimeofday];
 		$spotcachedays = 2 if $spotcachedays < 2;
 		dbg "Spot::init - reading in $spotcachedays days of spots into cache"; 
@@ -260,18 +260,11 @@ sub add
 {
 	my $buf = join('^', @_);
 	$fp->writeunix($_[2], $buf);
-	if ($spotcachedays) {
+	if ($spotcachedays > 0) {
 		my $now = Julian::Day->new($_[2]);
 		my $day = _cachek($now);
 		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;
@@ -376,7 +369,7 @@ sub search
 		my $cachekey = _cachek($this); 
 		my $rec = 0;
 
-		if ($spotcachedays && $spotcache{$cachekey}) {
+		if ($spotcachedays > 0 && $spotcache{$cachekey}) {
 			foreach my $r (@{$spotcache{$cachekey}}) {
 				++$rec;
 				if ($dofilter && $dxchan && $dxchan->{spotsfilter}) {
@@ -465,9 +458,20 @@ sub ftor
 # format a spot for user output in list mode
 sub formatl
 {
-	my $t = ztime($_[2]);
-	my $d = cldate($_[2]);
-	return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
+	my $t = ztime($_[3]);
+	my $d = cldate($_[3]);
+	my $spotter = "<$_[5]>";
+	my $comment = $_[4] || '';
+	$comment =~ s/\t+/ /g;
+	my $cl = length $comment;
+	my $s = sprintf "%9.1f %-11s %s %s", $_[1], $_[2], $d, $t;
+	my $width = ($_[0] ? $_[0] : 80) - length($spotter) - length($s) - 4;
+	
+	$comment = substr $comment, 0, $width if $cl > $width;
+	$comment .= ' ' x ($width-$cl) if $cl < $width;
+
+#	return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
+	return "$s $comment$spotter";
 }
 
 # enter the spot for dup checking and return true if it is already a dup
@@ -584,12 +588,27 @@ sub daily
 {
 	my $date = Julian::Day->new($main::systime)->sub(1);
 	genstats($date) unless checkstats($date);
+	clean_cache();
 }
 
 sub _cachek
 {
 	return "$_[0]->[0]|$_[0]->[1]";
 }
+
+sub clean_cache
+{
+	if ($spotcachedays > 0) {
+		my $now = Julian::Day->new($main::systime);
+		for (my $i = $spotcachedays; $i < $spotcachedays + 5; ++$i ) {
+			my $k = _cachek($now->sub($i));
+			if (exists $spotcache{$k}) {
+				dbg("Spot::spotcache deleting day $k, more than $spotcachedays days old");
+				delete $spotcache{$k};
+			}
+		}
+	}
+}
 1;