rbn, ve7cc improvements and fixes

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index 3bfee12a3ccb06355bd64d4700ce3f3f91b4547b..2205cc5bce1e127226599e66a866e9928d571688 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -48,11 +48,13 @@ $filterdef = bless ([
                                         ['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],
@@ -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;
@@ -329,6 +331,7 @@ sub search
                        my $rec = 0;
                        my $in;
                        while (<$fh>) {
+                               chomp;
                                my @r = split /\^/;
                                ++$rec;
                                if ($dxchan) {