X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCluster.pm;h=205c30fb65552f2deaaef61997eed660e11d828d;hb=30dbf70f84b53174005810f64f546d2181e1a8c6;hp=aee8fe4d94a0c6a0e1c192fb1d94d836b705edd1;hpb=8cf374587593eacd30423223278ed63df45babc6;p=spider.git diff --git a/perl/DXCluster.pm b/perl/DXCluster.pm index aee8fe4d..205c30fb 100644 --- a/perl/DXCluster.pm +++ b/perl/DXCluster.pm @@ -17,6 +17,7 @@ package DXCluster; use Exporter; @ISA = qw(Exporter); use DXDebug; +use DXUtil; use Carp; use strict; @@ -25,13 +26,13 @@ use vars qw(%cluster %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', - dxchan => '5,Channel ref', + dxchan => '5,Channel ref,DXCluster::showcall', pcversion => '5,Node Version', - list => '5,User List,dolist', + list => '5,User List,DXCluster::dolist', users => '0,No of Users', ); @@ -102,6 +103,14 @@ sub field_prompt 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 @@ -110,7 +119,8 @@ sub dolist 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 ";