Fix Filtering, RBN changes

[spider.git] / perl / Spot.pm

diff --git a/perl/Spot.pm b/perl/Spot.pm
index be175ff04ca26e153a773630a58385e92e19e055..763c60bda86747a30df086dac5c10f2f11e3c14c 100644 (file)
--- 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],
@@ -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;