X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=fee2c15b0af48cc32acadc3aee05888f339882e5;hb=331ae9a34defd23c476ceaecdf29d9f49b60faed;hp=462cb673f7fd02db3b00e6bb94a4e4a4ba9df3df;hpb=4c8be388424d403a33d72798b02e49c4f1bfd0ef;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 462cb673..fee2c15b 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -27,7 +27,7 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0))
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots );
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth);
 
 $fp = undef;
 $statp = undef;
@@ -37,6 +37,7 @@ $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
+$maxcalllth = 12;                               # the max length of call to take into account for dupes
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['freq', 'r', 0, 0, \&decodefreq],
@@ -136,7 +137,7 @@ sub prepare
 
 sub add
 {
-	my $buf = join("\^", @_);
+	my $buf = join('^', @_);
 	$fp->writeunix($_[2], $buf);
 	$totalspots++;
 	if ($_[0] <= 30000) {
@@ -328,28 +329,22 @@ sub dup
 	$d *= 60;
 
 	$freq = sprintf "%.1f", $freq;       # normalise frequency
-	$call = substr($call, 0, 12) if length $call > 12;
+	$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
 
-	# quick test now for simple case
-	my $sdupkey = "X$freq|$call|$d|$by";
-	return 1 if DXDupe::find($sdupkey);
-	
 	chomp $text;
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
+	$text = unpad($text);
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
-	unpad($text);
 	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
 	$text =~ s/[^a-zA-Z0-9]//g;
-	for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
-		my $dt = $d - $_;
-		my $ldupkey = "X$freq|$call|$dt|\L$text";
-		my $sdupkey = "X$freq|$call|$dt|$by";
-		return 1 if DXDupe::find($ldupkey) || DXDupe::find($sdupkey);
-	}
-	my $ldupkey = "X$freq|$call|$d|\L$text";
-	$sdupkey = "X$freq|$call|$d|$by";
+	my $ldupkey = "X$freq|$call|$by" . uc $text;
+	my $t = DXDupe::find($ldupkey);
+	return 1 if $t && $t - $main::systime > 0;
 	DXDupe::add($ldupkey, $main::systime+$dupage);
-	DXDupe::add($sdupkey, $main::systime+$dupage);
+#	my $sdupkey = "X$freq|$call|$by";
+#	$t = DXDupe::find($sdupkey);
+#	return 1 if $t && $t - $main::systime > 0;	
+#	DXDupe::add($sdupkey, $main::systime+$dupage);
 	return 0;
 }