X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FSpot.pm;h=2205cc5bce1e127226599e66a866e9928d571688;hb=17b1614af3840c2c74bee181290eb094f8ed4a00;hp=8b703306e25e0f1b94f86c1bbbddabca0a2a70e1;hpb=86d0e8cc034db0b0d23afc09b6f596c38a57885d;p=spider.git

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 8b703306..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,6 +331,7 @@ sub search
 			my $rec = 0;
 			my $in;
 			while (<$fh>) {
+				chomp;
 				my @r = split /\^/;
 				++$rec;
 				if ($dxchan) {