X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=8e83667898793142b80ae1ec3cc430f97f53f14a;hb=bf5eb90cfb12c5070db6726af98d1d464bdb4ea3;hp=b5b75e3883fcbb9825ffd788eaea94502dd77eae;hpb=0e49d2c191786b825674e0cca106eef004c99899;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index b5b75e38..8e836678 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -23,7 +23,7 @@ use vars qw($fp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $fil
 $fp = undef;
 $maxspots = 50;					# maximum spots to return
 $defaultspots = 10;				# normal number of spots to return
-$maxdays = 3*31;				# normal maximum no of days to go back
+$maxdays = 100;				# normal maximum no of days to go back
 $dirprefix = "spots";
 $duplth = 20;					# the length of text to use in the deduping
 $dupage = 3*3600;               # the length of time to hold spot dups
@@ -102,7 +102,7 @@ sub prepare
 	my @out = @_[0..4];      # just up to the spotter
 
 	# normalise frequency
-	$_[0] = sprintf "%.f", $_[0];
+	$_[0] = sprintf "%.1f", $_[0];
   
 	# remove ssids if present on spotter
 	$out[4] =~ s/-\d+$//o;
@@ -169,7 +169,8 @@ sub search
 	my @todate;
 
 	$dayfrom = 0 if !$dayfrom;
-	$dayto = $maxdays if !$dayto;
+	$dayto = $maxdays unless $dayto;
+	$dayto = $dayfrom + $maxdays if $dayto < $dayfrom;
 	@fromdate = Julian::sub(@today, $dayfrom);
 	@todate = Julian::sub(@fromdate, $dayto);
 	$from = 0 unless $from;
@@ -182,7 +183,7 @@ sub search
 	$expr =~ s/\$f(\d)/\$ref->[$1]/g; # swap the letter n for the correct field name
 	#  $expr =~ s/\$f(\d)/\$spots[$1]/g;               # swap the letter n for the correct field name
   
-	dbg("search", "hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n");
+	dbg("hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search');
   
 	# build up eval to execute
 	$eval = qq(