From a9b009e5b767bcf7d9ce522902635d1d462f2bab Mon Sep 17 00:00:00 2001
From: minima <minima>
Date: Mon, 6 Mar 2006 09:21:36 +0000
Subject: [PATCH] change the filter reading order to call, call no ssid,
user_default.
---
Changes | 2 ++
perl/DXCommandmode.pm | 19 +++++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Changes b/Changes
index 4a738599..ee9fc831 100644
--- 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 3a94fb6a..843bccdc 100644
--- 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;
--
2.43.0