X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=88f13a0089cb4558245a48c90f3258a163f19ccb;hb=24fb0e58dd1f7bc62eb3924b81d37ea3763535f4;hp=c492d918ab98a5a6941d3fb5a3c6451327a73223;hpb=433209e1efed23493f25f1357d9c003696c1fb59;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index c492d918..88f13a00 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -33,7 +33,7 @@ $maxspots = 100;					# maximum spots to return
 $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
+$duplth = 15;					# the length of text to use in the deduping
 $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 ([
@@ -77,7 +77,7 @@ our $readback = $main::is_win ? 0 : 1; # don't read spot files backwards if it's
 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
-
+our $no_node_in_dupe = 1;		# remove the node field from dupe considerations. 
 
 if ($readback) {
 	$readback = `which tac`;
@@ -502,30 +502,64 @@ sub dup
 	
 	$call = substr($call, 0, $maxcalllth) if length $call > $maxcalllth;
 
+	my $dtext ;
 	
+	my $l = length $text;
+	$dtext = qq{original:'$text'($l)} if isdbg('spottext');
+
 	chomp $text;
+	
 	$text =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	$text = uc unpad($text);
+
+	$l = length $text;
+	$dtext .= qq{->afterhex: '$text'($l)} if isdbg('spottext');
+	my @dubious;
+	if (isdbg('spottext')) {
+		(@dubious) = $text =~ /([?\x00-\x08\x0a-\x1F\x7B-\xFF]+)+/;
+		$dtext .= sprintf q{DUBIOUS '%s'}, join '', @dubious if @dubious;
+	}
+
 	my $otext = $text;
 #	$text = Encode::encode("iso-8859-1", $text) if $main::can_encode && Encode::is_utf8($text, 1);
 	$text =~ s/^\+\w+\s*//;			# remove leading LoTW callsign
-	$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$// if length $text > 24;
+	$text =~ s/\s{2,}[\dA-Z]?[A-Z]\d?$//g if length $text > 24;
+	$text =~ s/\x09+//g;
 	$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|$node|$qrg|$nd|$text";
+	$text = substr($text, 0, $duplth) if length $text > $duplth;
 
-	dbg("Spot::dup ldupkey $ldupkey") if isdbg('spotdup');
-	
-	my $t = DXDupe::find($ldupkey);
-	return 1 if $t && $t - $main::systime > 0;
+	$l = length $text;
+	$dtext .= qq{->final:'$text'($l)} if isdbg('spottext');
+
+	my $t = 0;
+	my $ldupkey;
+
+	# new feature: don't include the origin node in Spot dupes
+	# default = true
+	unless ($no_node_in_dupe) {
+		$ldupkey = $oldstyle ? "X|$call|$by|$node|$freq|$d|$text" : "X|$call|$by|$node|$qrg|$nd|$text";
+
+		$t = DXDupe::find($ldupkey);
+		dbg("Spot::dup ldupkey $ldupkey t '$t'") if isdbg('spotdup');
+		$dtext .= ' DUPE' if $t;
+		dbg("text transforms: $dtext") if length $text && isdbg('spottext');
+		return 1 if $t > 0;	
+		
+		DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
+	}
 	
-	DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
 	$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
 	$otext =~ s/\s+$//;
 	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 (OTEXT) ldupkey $ldupkey t '$t'") if isdbg('spotdup');
+		if (isdbg('spottext')) {
+			$dtext .= sprintf q{ DUBIOUS '%s'}, join '', @dubious if @dubious;
+			$dtext .= ' DUPE (OTEXT)' if $t;
+			dbg("text transforms: $dtext") if length $text;
+		}
+		return 1 if $t > 0;
 		DXDupe::add($ldupkey, $main::systime+$dupage) unless $just_find;
 	}
 	return undef;