X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXChannel.pm;h=9d52d67c3a204481a220e2feac51a833efd4357b;hb=15a742ea0f1983282fdff272a362555afbdb99ad;hp=df74bfc89302fdf00f398735bd53df5b5985a546;hpb=72e9dcbade3fdb51d9291a2856ca1cc998241f9b;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index df74bfc8..9d52d67c 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -17,9 +17,9 @@
 #
 # PLEASE NOTE - I am a C programmer using this as a method of learning perl
 # firstly and OO about ninthly (if you don't like the design and you can't 
-# improve it with better OO by make it smaller and more efficient, then tough). 
+# improve it with better OO and thus make it smaller and more efficient, then tough). 
 #
-# Copyright (c) 1998 - Dirk Koopman G1TLH
+# Copyright (c) 1998-2000 - Dirk Koopman G1TLH
 #
 # $Id$
 #
@@ -86,6 +86,8 @@ use vars qw(%channels %valid);
 		  pingtime => '5,Ping totaltime,parray',
 		  pingave => '0,Ping ave time',
 		  logininfo => '9,Login info req,yesno',
+		  talklist => '0,Talk List,parray',
+		  cluster => '5,Cluster data',
 		 );
 
 # object destruction
@@ -105,6 +107,7 @@ sub DESTROY
 	undef $self->{inwwvfilter};
 	undef $self->{inspotfilter};
 	undef $self->{passwd};
+	undef $self->{node};
 }
 
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@ -130,12 +133,6 @@ sub alloc
 	$self->{lang} = $main::lang if !$self->{lang};
 	$self->{func} = "";
 
-	# get the filters
-	$self->{spotfilter} = Filter::read_in('spots', $call, 0);
-	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0);
-	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0);
-	$self->{annfilter} = Filter::read_in('ann', $call, 0);
-
 	bless $self, $pkg; 
 	return $channels{$call} = $self;
 }
@@ -157,12 +154,11 @@ sub get_all
 #
 # gimme all the ak1a nodes
 #
-sub get_all_ak1a
+sub get_all_nodes
 {
-	my @list = DXChannel->get_all();
 	my $ref;
 	my @out;
-	foreach $ref (@list) {
+	foreach $ref (values %channels) {
 		push @out, $ref if $ref->is_node;
 	}
 	return @out;
@@ -171,10 +167,9 @@ sub get_all_ak1a
 # return a list of all users
 sub get_all_users
 {
-	my @list = DXChannel->get_all();
 	my $ref;
 	my @out;
-	foreach $ref (@list) {
+	foreach $ref (values %channels) {
 		push @out, $ref if $ref->is_user;
 	}
 	return @out;
@@ -183,11 +178,10 @@ sub get_all_users
 # return a list of all user callsigns
 sub get_all_user_calls
 {
-	my @list = DXChannel->get_all();
 	my $ref;
 	my @out;
-	foreach $ref (@list) {
-		push @out, $ref->call if $ref->is_user;
+	foreach $ref (values %channels) {
+		push @out, $ref->{call} if $ref->is_user;
 	}
 	return @out;
 }
@@ -285,7 +279,7 @@ sub send_now
 	my $call = $self->{call};
 	
 	for (@_) {
-		chomp;
+#		chomp;
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_now("$sort$call|$_");
@@ -306,7 +300,7 @@ sub send						# this is always later and always data
 	my $call = $self->{call};
 
 	for (@_) {
-		chomp;
+#		chomp;
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_later("D$call|$_");
@@ -361,7 +355,7 @@ sub state
 		dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
 
 		# if there is any queued up broadcasts then splurge them out here
-		if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'convers')) {
+		if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'talk')) {
 			$self->send (@{$self->{delayed}});
 			delete $self->{delayed};
 		}
@@ -441,7 +435,7 @@ sub decode_input
 {
 	my $dxchan = shift;
 	my $data = shift;
-	my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z1-9\-]{3,9})\|(.*)$/;
+	my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z0-9\-]{3,9})\|(.*)$/;
 
 	my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
 	
@@ -465,8 +459,13 @@ sub AUTOLOAD
 	$name =~ s/.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
-	@_ ? $self->{$name} = shift : $self->{$name} ;
+
+	# this clever line of code creates a subroutine which takes over from autoload
+	# from OO Perl - Conway
+	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+    @_ ? $self->{$name} = shift : $self->{$name} ;
 }
 
+
 1;
 __END__;