use DXDebug;
use strict;
+use vars qw(%cluster %valid);
-my %cluster = (); # this is where we store the dxcluster database
+%cluster = (); # this is where we store the dxcluster database
-my %valid = (
+%valid = (
mynode => '0,Parent Node,showcall',
call => '0,Callsign',
confmode => '0,Conference Mode,yesno',
return values(%cluster);
}
-sub delcluster;
-{
- my $self = shift;
- delete $cluster{$self->{call}};
-}
-
-
# return a prompt for a field
sub field_prompt
{
use DXDebug;
use strict;
-my $users = 0;
+use vars qw($users);
+
+$users = 0;
sub new
{
my $self = $pkg->alloc($dxchan, $call, $confmode, $here);
$self->{mynode} = $node;
- $self->{list}->{$call} = $self; # add this user to the list on this node
+ $node->{list}->{$call} = $self; # add this user to the list on this node
$users++;
- dbg('cluster', "allocating user $self->{call}\n");
+ dbg('cluster', "allocating user $call to $node->{call} in cluster\n");
+ $node->update_users;
return $self;
}
my $self = shift;
my $call = $self->{call};
my $node = $self->{mynode};
-
+
delete $node->{list}->{$call};
- delete $cluster{$call}; # remove me from the cluster table
+ delete $DXCluster::cluster{$call}; # remove me from the cluster table
+ dbg('cluster', "deleting user $call from $node->{call} in cluster\n");
+ $node->update_users;
$users-- if $users > 0;
}
use DXDebug;
use strict;
-my $nodes = 0;
+use vars qw($nodes);
+
+$nodes = 0;
sub new
{
my ($pkg, $dxchan, $call, $confmode, $here, $pcversion) = @_;
my $self = $pkg->alloc($dxchan, $call, $confmode, $here);
- $self->{version} = $pcversion;
+ $self->{pcversion} = $pcversion;
$self->{list} = { } ;
$nodes++;
- dbg('cluster', "allocating node $self->{call}\n");
+ dbg('cluster', "allocating node $call to cluster\n");
return $self;
}
{
my $list;
my @out;
- foreach $list (values(%cluster)) {
+ foreach $list (values(%DXCluster::cluster)) {
push @out, $list if $list->{pcversion};
}
return @out;
foreach $ref (values %{$self->{list}}) {
$ref->del(); # this also takes them out of this list
}
+ delete $DXCluster::cluster{$call}; # remove me from the cluster table
+ dbg('cluster', "deleting node $call from cluster\n");
$nodes-- if $nodes > 0;
}
sub update_users
{
my $self = shift;
- if (%{$self->{list}}) {
- $self->{users} = scalar %{$self->{list}};
+ my $count = shift;
+ if ((keys %{$self->{list}})) {
+ $self->{users} = (keys %{$self->{list}});
} else {
- $self->{users} = shift;
+ $self->{users} = $count;
}
}