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

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 27b82b38..f4b5f3cd 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"; 
@@ -238,10 +238,9 @@ sub prepare
 	# remove ssids and /xxx if present on spotter
 	$out[4] =~ s/-\d+$//o;
 
-	# remove leading and trailing spaces
+	# remove leading and trailing spaces from comment field
 	$out[3] = unpad($out[3]);
 	
-	
 	# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
 	my @spd = Prefix::cty_data($out[1]);
 	push @out, $spd[0];
@@ -260,18 +259,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;
@@ -355,6 +347,7 @@ sub search
 	dbg("Spot::search hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search');
   
 	# build up eval to execute
+
 	dbg("Spot::search Spot eval: $expr") if isdbg('searcheval');
 	$expr =~ s/\$r/\$_[0]/g;
 	my $eval = qq{ sub { return $expr; } };
@@ -362,7 +355,6 @@ sub search
 	my $ecode = eval $eval;
 	return ("Spot search error", $@) if $@;
 	
-	
 	my $fh;
 	my $now = $fromdate;
 	my $today = Julian::Day->new($main::systime);
@@ -376,7 +368,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,15 +457,26 @@ 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
 sub dup
 {
-	my ($freq, $call, $d, $text, $by, $cty) = @_; 
+	my ($freq, $call, $d, $text, $by, $node) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
@@ -492,21 +495,16 @@ sub dup
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = uc unpad($text);
-	if ($cty && $text && length $text <= 4) {
-		unless ($text =~ /^C?Q/ || $text =~ /^[\d\W]+$/) {
-			my @try = Prefix::cty_data($text);
-			$text = "" if $cty == $try[0];
-		}
-	}
 	my $otext = $text;
 #	$text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
 	$text =~ s/^\+\w+\s*//;			# remove leading LoTW callsign
 	$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
 	$text =~ s/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure!
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
-	my $ldupkey = "X$freq|$call|$by|$text";
+	my $ldupkey = "X$|$call|$by|$node|$freq|$d|$text";
 	my $t = DXDupe::find($ldupkey);
 	return 1 if $t && $t - $main::systime > 0;
+	
 	DXDupe::add($ldupkey, $main::systime+$dupage);
 	$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
 	$otext =~ s/\s+$//;
@@ -516,7 +514,7 @@ sub dup
 		return 1 if $t && $t - $main::systime > 0;
 		DXDupe::add($ldupkey, $main::systime+$dupage);
 	}
-	return 0;
+	return undef;
 }
 
 sub listdups
@@ -584,12 +582,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;