X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=99f0c83ed743934216698b7149ddff59b1647240;hb=70d6fc010dd321598034d08907d3dfc98414cfca;hp=d49136b725284b57a4984195d8d41b8c330518b8;hpb=acdfe8cb621fd43d4f6c3ddac0a4078e9cc3e5f6;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index d49136b7..99f0c83e 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;
@@ -36,7 +36,8 @@ $defaultspots = 10;				# normal number of spots to return
 $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
+$dupage = 1*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],
@@ -318,7 +319,7 @@ sub readfile($)
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {
-	my ($freq, $call, $d, $text, $by) = @_; 
+	my ($freq, $call, $d, $text, $by, $cty) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
@@ -328,28 +329,28 @@ 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;
 
 	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 =~ /^CQ/ || $text =~ /^\d+$/) {
+			my @try = Prefix::cty_data($text);
+			$text = "" if $cty == $try[0];
+		}
+	}
 	$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;
-	my $ldupkey = "X$freq|$call|\L$text";
-	my $sdupkey = "X$freq|$call|$by";
+	$text =~ s/[^\w]//g;
+	my $ldupkey = "X$freq|$call|$by|$text";
 	my $t = DXDupe::find($ldupkey);
-	if ($t) {
-		my $dt = $main::systime + $dupage - $t;
-		return 1 if $dt < 300;
-	}
-	$t = DXDupe::find($sdupkey);
-	if ($t) {
-		my $dt = $main::systime + $dupage - $t;
-		return 1 if $dt < 300;
-	}
+	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;
 }