X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=9f5c8645511711919943fc6564b239f59918bbda;hb=4137292dd2e67b2fe8fdfcfe431b25045719910c;hp=9b67cc5fb54f3a7d9e562e8247fc46c40b2ca29e;hpb=5b9ab81174d4a7734c92af52da6ddf89e980e321;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 9b67cc5f..9f5c8645 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -50,7 +50,10 @@ $filterdef = bless ([
 			  ['call_zone', 'nz', 9],
 			  ['by_itu', 'ni', 10],
 			  ['by_zone', 'nz', 11],
-			  ['channel', 'c', 12],
+			  ['call_state', 'ns', 12],
+			  ['by_state', 'ns', 13],
+			  ['channel', 'c', 14],
+					 
 			 ], 'Filter::Cmd');
 $totalspots = $hfspots = $vhfspots = 0;
 
@@ -122,19 +125,28 @@ sub prepare
 	# remove leading and trailing spaces
 	$_[3] = unpad($_[3]);
 	
+	my ($spotted_dxcc, $spotted_itu, $spotted_cq, $spotted_state) = (666, 0, 0, "");
+	my ($spotter_dxcc, $spotter_itu, $spotter_cq, $spotter_state) = (666, 0, 0, "");
+	
 	# add the 'dxcc' country on the end for both spotted and spotter, then the cluster call
 	my @dxcc = Prefix::extract($out[1]);
-	my $spotted_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
-	my $spotted_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
-	my $spotted_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
+	if (@dxcc) {
+		$spotted_dxcc = $dxcc[1]->dxcc();
+		$spotted_itu = $dxcc[1]->itu();
+		$spotted_cq = $dxcc[1]->cq();
+		$spotted_state = $dxcc[1]->state();
+	}
 	push @out, $spotted_dxcc;
 	@dxcc = Prefix::extract($out[4]);
-	my $spotter_dxcc = (@dxcc > 0 ) ? $dxcc[1]->dxcc() : 666;
-	my $spotter_itu = (@dxcc > 0 ) ? $dxcc[1]->itu() : 0;
-	my $spotter_cq = (@dxcc > 0 ) ? $dxcc[1]->cq() : 0;
+	if (@dxcc) {
+		$spotter_dxcc = $dxcc[1]->dxcc();
+		$spotter_itu = $dxcc[1]->itu();
+		$spotter_cq = $dxcc[1]->cq();
+		$spotter_state = $dxcc[1]->state();
+	}
 	push @out, $spotter_dxcc;
 	push @out, $_[5];
-	return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq);
+	return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq, $spotted_state, $spotter_state);
 }
 
 sub add
@@ -300,7 +312,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) = @_; 
+	my ($freq, $call, $d, $text, $by) = @_; 
 
 	# dump if too old
 	return 2 if $d < $main::systime - $dupage;
@@ -311,19 +323,27 @@ sub dup
 
 	$freq = sprintf "%.1f", $freq;       # normalise frequency
 	$call = substr($call, 0, 12) if length $call > 12;
+
+	# 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 (0,60,120,180,240,300) {
+	for (-60, -120, -180, -240, 0, 60, 120, 180, 240, 300) {
 		my $dt = $d - $_;
-		my $dupkey = "X$freq|$call|$dt|\L$text";
-		return 1 if DXDupe::find($dupkey);
+		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 $dupkey = "X$freq|$call|$d|\L$text";
-	DXDupe::add($dupkey, $main::systime+$dupage);
+	my $ldupkey = "X$freq|$call|$d|\L$text";
+	$sdupkey = "X$freq|$call|$d|$by";
+	DXDupe::add($ldupkey, $main::systime+$dupage);
+	DXDupe::add($sdupkey, $main::systime+$dupage);
 	return 0;
 }