X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=2205cc5bce1e127226599e66a866e9928d571688;hb=17b1614af3840c2c74bee181290eb094f8ed4a00;hp=185711b5b428f1b3099b0def7030e4a7afd75f03;hpb=e7a28420ced12c94812516b17194c997dcc759e9;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 185711b5..2205cc5b 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -41,17 +41,20 @@ $filterdef = bless ([
 					 ['info', 't', 3],
 					 ['spotter', 'c', 4],
 					 ['by', 'c', 4],
+					 ['dxcc', 'nc', 5],
 					 ['call_dxcc', 'nc', 5],
 					 ['by_dxcc', 'nc', 6],
 					 ['origin', 'c', 7, 9],
 					 ['call_itu', 'ni', 8],
 					 ['itu', 'ni', 8],
 					 ['call_zone', 'nz', 9],
+					 ['cq', 'nz', 9],
 					 ['zone', 'nz', 9],
 					 ['by_itu', 'ni', 10],
 					 ['byitu', 'ni', 10],
 					 ['by_zone', 'nz', 11],
 					 ['byzone', 'nz', 11],
+					 ['bycq', 'nz', 11],
 					 ['call_state', 'ns', 12],
 					 ['state', 'ns', 12],
 					 ['by_state', 'ns', 13],
@@ -63,10 +66,9 @@ $filterdef = bless ([
 $totalspots = $hfspots = $vhfspots = 0;
 $use_db_for_search = 0;
 
-our $usetac = 1;
-our $readback;
+our $readback = 1;
 
-if ($usetac) {
+if ($readback) {
 	$readback = `which tac`;
 	chomp $readback;
 }
@@ -89,7 +91,7 @@ sub decodefreq
 	
 	foreach $f (@f) {
 		my ($a, $b); 
-		if (m{^\d+/\d+$}) {
+		if ($f =~ m{^\d+/\d+$}) {
 			push @out, $f;
 		} elsif (($a, $b) = $f =~ m{^(\w+)(?:/(\w+))?$}) {
 			$b = lc $b if $b;
@@ -293,7 +295,7 @@ sub search
 		return $main::dbh->spot_search($hint, $dayfrom, $dayto, $to-$from, $dxchan);
 	}
 
-#	$expr =~ s/\$f(\d\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
   
 
@@ -313,28 +315,39 @@ sub search
 	my @spots;
 	my $recs;
 	
-	for ($i = $count = 0; $count < $to && $i < $maxdays; ++$i) {	# look thru $maxdays worth of files only
+	for ($i = $count = 0; $count < $to && $i < $maxdays; ++$i) { # look thru $maxdays worth of files only
 		last if $now->cmp($todate) <= 0;
 		
 		my $fn = $fp->fn($now->sub($i));
 		if ($readback) {
 			dbg("Spot::search search using tac fn: $fn $i") if isdbg('search');
 			$fh = IO::File->new("$readback $fn |");
-		} else {
+		}
+		else {
 			dbg("Spot::search search fn: $fp->{fn} $i") if isdbg('search');
-			$fh = $fp->open($now->sub($i));      # get the next file
+			$fh = $fp->open($now->sub($i));	# get the next file
 		}
 		if ($fh) {
 			my $rec = 0;
 			my $in;
 			while (<$fh>) {
+				chomp;
 				my @r = split /\^/;
 				++$rec;
+				if ($dxchan) {
+					my ($gotone, undef) = $dxchan->{spotsfilter}->it(@r);
+					next unless $gotone;
+				}
 				if (&$ecode(\@r)) {
 					++$count;
 					next if $count < $from;
-					push @out, \@r;
-					last if $count >= $to;
+					if ($readback) {
+						push @out, \@r;
+						last if $count >= $to;
+					} else {
+						push @out, \@r;
+						shift @out if $count >= $to;
+					}
 				}
 			}
 			dbg("Spot::search recs read: $rec") if isdbg('search');
@@ -343,9 +356,8 @@ sub search
 			return ("Spot search error", $@) if $@;
 		}
 	}
-   
-
-	return $readback ? @out : reverse @out;
+	@out = sort {$b->[2] <=> $a->[2]} @out if @out;
+	return @out;
 }
 
 # change a freq range->regular expression
@@ -385,24 +397,6 @@ sub formatl
 	return sprintf "%8.1f  %-11s %s %s  %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
 }
 
-#
-# return all the spots from a day's file as an array of references
-# the parameter passed is a julian day
-sub readfile($)
-{
-	my @spots;
-	
-	my $fh = $fp->open(shift); 
-	if ($fh) {
-		my $in;
-		while (<$fh>) {
-			chomp;
-			push @spots, [ split '\^' ];
-		}
-	}
-	return @spots;
-}
-
 # enter the spot for dup checking and return true if it is already a dup
 sub dup
 {