X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=64db9a722498109f10edcda7a5470ba2f05577b8;hb=d1bb2509404e68cb69d075329312818d1c47ad13;hp=792aa2e79e122c0ea8de7d777881d2994c0bbcee;hpb=42e13afbe924d02919cef432ab0cee537ed1e20d;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 792aa2e7..64db9a72 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -74,8 +74,8 @@ our $spotcachedays = 2;			# default 2 days worth
 our $minselfspotqrg = 1240000;	# minimum freq above which self spotting is allowed
 
 our $readback = $main::is_win ? 0 : 1; # don't read spot files backwards if it's windows
-our $qrggranularity = 100000;	# normalise the qrg to this number of hz (default: 100khz), so tough luck if you have a fumble fingers moment
-our $timegranularity = 600;		# ditto to the nearest second 
+our $qrggranularity = 1000;	# normalise the qrg to this number of hz (default: 100khz), so tough luck if you have a fumble fingers moment
+our $timegranularity = 600;		# ditto to the nearest 100 seconds 
 our $oldstyle = 0;				# revert to traditional dupe key format
 
 
@@ -193,7 +193,6 @@ sub init
 	if ($spotcachedays > 0) {
 		my $t0 = [gettimeofday];
 		$spotcachedays = 2 if $spotcachedays < 2;
-		dbg "Spot::init - reading in $spotcachedays days of spots into cache"; 
 		for (my $i = 0; $i < $spotcachedays; ++$i) {
 			my $now = $today->sub($i);
 			my $fh = $fp->open($now);
@@ -480,25 +479,30 @@ sub formatl
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-	my ($freq, $call, $d, $text, $by, $node, $just_find) = @_; 
+	my ($freq, $call, $d, $text, $by, $node, $just_find) = @_;
+
+	dbg("Spot::dup: freq=$freq call=$call d=$d text='$text' by=$by node=$node" . ($just_find ? " jf=$just_find" : "")) if isdbg('spotdup');
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
 
-	my $nd = nearest_floor($d, $timegranularity);
-
 	# turn the time into minutes (should be already but...)
 	$d = int ($d / 60);
 	$d *= 60;
 
+	my $nd = nearest($timegranularity, $d);
+
 	# remove SSID or area
 	$by =~ s|[-/]\d+$||;
 	
 #	$freq = sprintf "%.1f", $freq;       # normalise frequency
 	$freq = int $freq;       # normalise frequency
-	my $qrg = nearest_floor($freq, $qrggranularity); # to the nearest however many hz
+
+	my $qrg = nearest($qrggranularity, $freq); # to the nearest however many hz
+	
 	$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
 
+	
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = uc unpad($text);
@@ -508,10 +512,11 @@ sub dup
 	$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 = $oldstyle ? "X|$call|$by|$node|$freq|$d|$text" : "X|$call|$by|$qrg|$nd|$text";
+	my $ldupkey = $oldstyle ? "X|$call|$by|$node|$freq|$d|$text" : "X|$call|$by|$node|$qrg|$nd|$text";
 
 	my $t = DXDupe::find($ldupkey);
-	return 1 if $t && $t - $main::systime > 0;
+	dbg("Spot::dup ldupkey $ldupkey t '$t'") if isdbg('spotdup');
+	return 1 if $t > 0;
 	
 	DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
 	$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
@@ -519,7 +524,8 @@ sub dup
 	if (length $otext && $otext ne $text) {
 		$ldupkey = $oldstyle ? "X|$freq|$call|$by|$otext" : "X|$qrg|$call|$by|$otext";
 		$t = DXDupe::find($ldupkey);
-		return 1 if $t && $t - $main::systime > 0;
+		dbg("Spot::dup ldupkey $ldupkey t '$t'") if isdbg('spotdup');
+		return 1 if $t > 0;
 		DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
 	}
 	return undef;