X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FSpot.pm;h=2205cc5bce1e127226599e66a866e9928d571688;hb=5bbe803ffc8771aa87c9d37ca92170f13bbc6bc1;hp=3d671d76ae0c90f20a54050b37498f98fc703120;hpb=8c339125008c925eefda7c815ccabac9c577ae3f;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 3d671d76..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,7 +66,7 @@ $filterdef = bless ([
 $totalspots = $hfspots = $vhfspots = 0;
 $use_db_for_search = 0;
 
-our $readback = 0;
+our $readback = 1;
 
 if ($readback) {
 	$readback = `which tac`;
@@ -88,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;
@@ -328,13 +331,23 @@ sub search
 			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');
@@ -384,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
 {