X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=fee2c15b0af48cc32acadc3aee05888f339882e5;hb=6afb4b66b19876b1e653750c98afa4c46de9af72;hp=4b0e7c72929ba3822afe2bbc0c3faebc39b709ed;hpb=bcf2892aa7f3c9957ee61365a6e032dd93044834;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 4b0e7c72..fee2c15b 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;
@@ -37,6 +37,7 @@ $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
+$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],
@@ -102,9 +103,6 @@ sub init
 	mkdir "$dirprefix", 0777 if !-e "$dirprefix";
 	$fp = DXLog::new($dirprefix, "dat", 'd');
 	$statp = DXLog::new($dirprefix, "dys", 'd');
-	my $rm = $main::is_win ? 'del' : 'rm -f';
-	system("$rm $main::data/$dirprefix/*/*.bys");
-	system("$rm $main::data/$dirprefix/*/*.cys");
 }
 
 sub prefix
@@ -121,39 +119,25 @@ sub prepare
 	# normalise frequency
 	$_[0] = sprintf "%.1f", $_[0];
   
-	# remove ssids if present on spotter
+	# remove ssids and /xxx if present on spotter
 	$out[4] =~ s/-\d+$//o;
 
 	# 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]);
-	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]);
-	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;
+	my @spd = Prefix::cty_data($out[1]);
+	push @out, $spd[0];
+	my @spt = Prefix::cty_data($out[4]);
+	push @out, $spt[0];
 	push @out, $_[5];
-	return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq, $spotted_state, $spotter_state);
+	return (@out, @spd[1,2], @spt[1,2], $spd[3], $spt[3]);
 }
 
 sub add
 {
-	my $buf = join("\^", @_[0..7]);
+	my $buf = join('^', @_);
 	$fp->writeunix($_[2], $buf);
 	$totalspots++;
 	if ($_[0] <= 30000) {
@@ -194,7 +178,7 @@ sub add
 
 sub search
 {
-	my ($expr, $dayfrom, $dayto, $from, $to, $hint) = @_;
+	my ($expr, $dayfrom, $dayto, $from, $to, $hint, $dxchan) = @_;
 	my $eval;
 	my @out;
 	my $ref;
@@ -216,9 +200,21 @@ sub search
 	
 	$to = $from + $maxspots if $to - $from > $maxspots || $to - $from <= 0;
 
-	$expr =~ s/\$f(\d)/\$ref->[$1]/g; # swap the letter n for the correct field name
+	$expr =~ s/\$f(\d\d?)/\$ref->[$1]/g; # swap the letter n for the correct field name
 	#  $expr =~ s/\$f(\d)/\$spots[$1]/g;               # swap the letter n for the correct field name
   
+	my $checkfilter;
+	$checkfilter = qq (
+                      if (\@s < 9) {
+                          my \@a = (Prefix::cty_data(\$s[1]))[1..3];
+                          my \@b = (Prefix::cty_data(\$s[4]))[1..3];
+                          push \@s, \@a[0,1], \@b[0,1], \$a[2], \$a[2];  
+                      }
+	                  my (\$filter, \$hops) = \$dxchan->{spotsfilter}->it(\@s);
+	                  next unless (\$filter);
+                      ) if $dxchan;
+	$checkfilter ||= ' ';
+	
 	dbg("hint='$hint', expr='$expr', spotno=$from-$to, day=$dayfrom-$dayto\n") if isdbg('search');
   
 	# build up eval to execute
@@ -226,7 +222,9 @@ sub search
 			   while (<\$fh>) {
 				   $hint;
 				   chomp;
-				   push \@spots, [ split '\\^' ];
+				   my \@s = split /\\^/;
+                   $checkfilter;
+                   push \@spots, \\\@s;
 			   }
 			   my \$c;
 			   my \$ref;
@@ -240,6 +238,9 @@ sub search
 					}
 				}
 			  );
+    
+	dbg("Spot eval: $eval") if isdbg('searcheval');
+	
 
 	$fp->close;					# close any open files
 
@@ -328,28 +329,22 @@ 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;
 
-	# 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 = unpad($text);
 	$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);
-	}
-	my $ldupkey = "X$freq|$call|$d|\L$text";
-	$sdupkey = "X$freq|$call|$d|$by";
+	my $ldupkey = "X$freq|$call|$by" . uc $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;
 }