X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=862f960282e2195943282f81f8d794ebc05d7a76;hb=f63d598af3f797b56b8d5e23ec4ff5254192eee9;hp=9019bb5b92dbfb6f8a0f0729de336d769918f999;hpb=66d98a2de271ef4a2702189e1d4284fe9fce5119;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 9019bb5b..862f9602 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -50,6 +50,7 @@ $filterdef = bless ([
 			  ['call_state', 'ns', 12],
 			  ['by_state', 'ns', 13],
 			  ['channel', 'c', 14],
+			  ['ip', 'c', 15],
 					 
 			 ], 'Filter::Cmd');
 $totalspots = $hfspots = $vhfspots = 0;
@@ -222,7 +223,7 @@ sub add
 #   $f5 = spotted dxcc country
 #   $f6 = spotter dxcc country
 #   $f7 = origin
-#
+#   $f8 = ip address
 #
 # In addition you can specify a range of days, this means that it will start searching
 # from <n> days less than today to <m> days less than today
@@ -302,6 +303,7 @@ sub search
 					}
 				}
 			  );
+	
     
 	dbg("Spot eval: $eval") if isdbg('searcheval');
 	
@@ -381,9 +383,8 @@ 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, $cty) = @_; 
+sub dup {
+	my ($freq, $call, $d, $text, $by, $node) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
@@ -402,21 +403,16 @@ sub dup
 	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 =~ /^C?Q/ || $text =~ /^[\d\W]+$/) {
-			my @try = Prefix::cty_data($text);
-			$text = "" if $cty == $try[0];
-		}
-	}
 	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/[\W\x00-\x2F\x7B-\xFF]//g; # tautology, just to make quite sure!
 	$text = substr($text, 0, $duplth) if length $text > $duplth; 
-	my $ldupkey = "X$freq|$call|$by|$text";
+	my $ldupkey = "X$|$call|$by|$node|$freq|$d|$text";
 	my $t = DXDupe::find($ldupkey);
 	return 1 if $t && $t - $main::systime > 0;
+	
 	DXDupe::add($ldupkey, $main::systime+$dupage);
 	$otext = substr($otext, 0, $duplth) if length $otext > $duplth; 
 	$otext =~ s/\s+$//;