X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=306bc282582e2b5b634df974f573848768c58f43;hb=e266b6c9d500dde73cf0025a63a8032ea1cf378d;hp=ef460a07ec0d036a1923bc3208fd604feb24ef9e;hpb=7d72afb65bc994c04c208095b66abddee41de7e9;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index ef460a07..306bc282 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -22,21 +22,21 @@ use QSL;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$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 );
+main::mkver($VERSION = q$Revision$);
+
+use vars qw($fp $statp $maxspots $defaultspots $maxdays $dirprefix $duplth $dupage $filterdef $totalspots $hfspots $vhfspots $maxcalllth );
 
 $fp = undef;
 $statp = undef;
-$maxspots = 100;					# maximum spots to return
+$maxspots = 100;				# maximum spots to return
 $defaultspots = 10;				# normal number of spots to return
-$maxdays = 100;				# 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
+$dupage = 3600;					# the length of time to hold spot dups
+$maxcalllth = 12;				# the maximum call lth
+
 $filterdef = bless ([
 			  # tag, sort, field, priv, special parser 
 			  ['freq', 'r', 0, 0, \&decodefreq],
@@ -352,7 +352,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;
@@ -361,29 +361,31 @@ sub dup
 	$d = int ($d / 60);
 	$d *= 60;
 
+	$by =~ s|[-/]\d+$||;
+	
 	$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 = 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);
+	$text = uc unpad($text);
+	if ($cty && $text && length $text <= 4) {
+		unless ($text =~ /^C?Q/ || $text =~ /^\d+$/) {
+			my @try = Prefix::cty_data($text);
+			$text = "" if $cty == $try[0];
+		}
 	}
-	my $ldupkey = "X$freq|$call|$d|\L$text";
-	$sdupkey = "X$freq|$call|$d|$by";
+	$text = substr($text, 0, $duplth) if length $text > $duplth;
+	$text = pack("C*", map {$_ & 127} unpack("C*", $text));
+	$text =~ s/[^\w]//g;
+	my $ldupkey = "X$freq|$call|$by|$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;
 }