change the filter reading order to call, call no ssid, user_default.

diff --git a/Changes b/Changes
index 4a738599c01041fdcda4d4c3d46d8f7a86304d12..ee9fc83172d550a5f26faf5335124d7dcfc15072 100644 (file)
--- a/Changes
+++ b/Changes
@@ -4,6 +4,8 @@
 related nodes.
 3. Add new command set/buddy to allow people to see when their favorite 
 chum(s) logins/out.
+4. Arrange filter reading so that the following order is followed for users: 
+callsign, callsign less ssid, user_default. Nodes are unchanged. 
 14Feb06=======================================================================
 1. Turn R and SFI around in mrtg.pl.
 13Feb06=======================================================================

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 3a94fb6a2629c82cb282ea6de174a2868c809ca7..843bccdc81d15c4b24a85ed9d0e024a62884dc1e 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -150,10 +150,21 @@ sub start
        $self->{priv} = 0 if $line =~ /^(ax|te)/ && !$self->conn->{usedpasswd};
 
        # get the filters
-       $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
-       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'user_default', 0);
-       $self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'user_default', 0);
-       $self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'user_default', 0) ;
+       my $nossid = $call;
+       $nossid =~ s/-\d+$//;
+       
+       $self->{spotsfilter} = Filter::read_in('spots', $call, 0) 
+               || Filter::read_in('spots', $nossid, 0)
+                       || Filter::read_in('spots', 'user_default', 0);
+       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) 
+               || Filter::read_in('wwv', $nossid, 0) 
+                       || Filter::read_in('wwv', 'user_default', 0);
+       $self->{wcyfilter} = Filter::read_in('wcy', $call, 0) 
+               || Filter::read_in('wcy', $nossid, 0) 
+                       || Filter::read_in('wcy', 'user_default', 0);
+       $self->{annfilter} = Filter::read_in('ann', $call, 0) 
+               || Filter::read_in('ann', $nossid, 0) 
+                       || Filter::read_in('ann', 'user_default', 0) ;
 
        # clean up qra locators
        my $qra = $user->qra;