projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that a privilege is always defined even if it is 0
[spider.git]
/
perl
/
DXCluster.pm
diff --git
a/perl/DXCluster.pm
b/perl/DXCluster.pm
index a741e5f2c4805742d6d18b1be780f09fc4b99aad..5d35e4a3051adc784a2c2e40fabc81c332f277f2 100644
(file)
--- a/
perl/DXCluster.pm
+++ b/
perl/DXCluster.pm
@@
-14,10
+14,8
@@
package DXCluster;
package DXCluster;
-use Exporter;
-@ISA = qw(Exporter);
use DXDebug;
use DXDebug;
-use
Carp
;
+use
DXUtil
;
use strict;
use vars qw(%cluster %valid);
use strict;
use vars qw(%cluster %valid);
@@
-25,13
+23,13
@@
use vars qw(%cluster %valid);
%cluster = (); # this is where we store the dxcluster database
%valid = (
%cluster = (); # this is where we store the dxcluster database
%valid = (
- mynode => '0,Parent Node,showcall',
+ mynode => '0,Parent Node,
DXCluster::
showcall',
call => '0,Callsign',
confmode => '0,Conference Mode,yesno',
here => '0,Here?,yesno',
call => '0,Callsign',
confmode => '0,Conference Mode,yesno',
here => '0,Here?,yesno',
- dxchan => '5,Channel ref',
+ dxchan => '5,Channel ref
,DXCluster::showcall
',
pcversion => '5,Node Version',
pcversion => '5,Node Version',
- list => '5,User List,dolist',
+ list => '5,User List,
DXCluster::
dolist',
users => '0,No of Users',
);
users => '0,No of Users',
);
@@
-102,6
+100,14
@@
sub field_prompt
my ($self, $ele) = @_;
return $valid{$ele};
}
my ($self, $ele) = @_;
return $valid{$ele};
}
+#
+# return a list of valid elements
+#
+
+sub fields
+{
+ return keys(%valid);
+}
# this expects a reference to a list in a node NOT a ref to a node
sub dolist
# this expects a reference to a list in a node NOT a ref to a node
sub dolist
@@
-110,7
+116,8
@@
sub dolist
my $out;
my $ref;
my $out;
my $ref;
- foreach $ref (@{$self}) {
+ foreach my $call (keys %{$self}) {
+ $ref = $$self{$call};
my $s = $ref->{call};
$s = "($s)" if !$ref->{here};
$out .= "$s ";
my $s = $ref->{call};
$s = "($s)" if !$ref->{here};
$out .= "$s ";
@@
-136,12
+143,6
@@
sub cluster
return " $DXNode::nodes nodes, $users local / $tot total users Max users $DXNode::maxusers Uptime $uptime";
}
return " $DXNode::nodes nodes, $users local / $tot total users Max users $DXNode::maxusers Uptime $uptime";
}
-sub DESTROY
-{
- my $self = shift;
- dbg('cluster', "destroying $self->{call}\n");
-}
-
no strict;
sub AUTOLOAD
{
no strict;
sub AUTOLOAD
{
@@
-251,7
+252,10
@@
sub del
}
delete $DXCluster::cluster{$call}; # remove me from the cluster table
dbg('cluster', "deleting node $call from cluster\n");
}
delete $DXCluster::cluster{$call}; # remove me from the cluster table
dbg('cluster', "deleting node $call from cluster\n");
- $nodes-- if $nodes > 0;
+ $users -= $self->{users}; # it may be PC50 updated only therefore > 0
+ $users = 0 if $users < 0;
+ $nodes--;
+ $nodes = 0 if $nodes < 0;
}
sub add_user
}
sub add_user
@@
-300,5
+304,13
@@
sub dolist
{
}
{
}
+
+sub DESTROY
+{
+ my $self = shift;
+ undef $self->{list} if $self->{list};
+}
+
+
1;
__END__
1;
__END__