X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=92ceba22577940c41cbba51faa732bd29834d1ef;hb=598233c22daef138cd7b0a653d3165b4a16905e2;hp=ff3351b3d6aaac0ea698b3e3ca3f12ec0dac7e65;hpb=148f4d43135748ba5aff985c50720b370ca1e336;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index ff3351b3..92ceba22 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -16,7 +16,7 @@ use strict;
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -24,7 +24,7 @@ use vars qw(%list %valid @ISA $max $filterdef);
 @ISA = qw(Route);
 
 %valid = (
-		  parent => '0,Parent Calls,parray',
+		  dxchan => '0,Visible on DXChans,parray',
 		  nodes => '0,Nodes,parray',
 		  users => '0,Users,parray',
 		  usercount => '0,User Count',
@@ -59,22 +59,22 @@ sub max
 # object with that callsign. The upper layers are expected to do something
 # sensible with this!
 #
-# called as $parent->add(call, dxchan, version, flags) 
+# called as $dxchan->add(call, dxchan, version, flags) 
 #
 
 sub add
 {
-	my $parent = shift;
+	my $dxchan = shift;
 	my $call = uc shift;
-	confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
+	confess "Route::add trying to add $call to myself" if $call eq $dxchan->{call};
 	my $self = get($call);
 	if ($self) {
-		$self->_addparent($parent);
-		$parent->_addnode($self);
+		$self->_adddxchan($dxchan);
+		$dxchan->_addnode($self);
 		return undef;
 	}
-	$self = $parent->new($call, @_);
-	$parent->_addnode($self);
+	$self = $dxchan->new($call, @_);
+	$dxchan->_addnode($self);
 	return $self;
 }
 
@@ -90,14 +90,14 @@ sub del
 	my $self = shift;
 	my $pref = shift;
 
-	# delete parent from this call's parent list
+	# delete dxchan from this call's dxchan list
 	$pref->_delnode($self);
-    $self->_delparent($pref);
+    $self->_deldxchan($pref);
 	my @nodes;
 	my $ncall = $self->{call};
 	
-	# is this the last connection, I have no parents anymore?
-	unless (@{$self->{parent}}) {
+	# is this the last connection, I have no dxchan anymore?
+	unless (@{$self->{dxchan}}) {
 		foreach my $rcall (@{$self->{nodes}}) {
 			next if grep $rcall eq $_, @_;
 			my $r = Route::Node::get($rcall);
@@ -112,11 +112,11 @@ sub del
 
 sub del_nodes
 {
-	my $parent = shift;
+	my $dxchan = shift;
 	my @out;
-	foreach my $rcall (@{$parent->{nodes}}) {
+	foreach my $rcall (@{$dxchan->{nodes}}) {
 		my $r = get($rcall);
-		push @out, $r->del($parent, $parent->{call}, @_) if $r;
+		push @out, $r->del($dxchan, $dxchan->{call}, @_) if $r;
 	}
 	return @out;
 }
@@ -142,7 +142,7 @@ sub add_user
 	my $uref = Route::User::get($ucall);
 	my @out;
 	if ($uref) {
-		@out = $uref->addparent($self);
+		@out = $uref->adddxchan($self);
 	} else {
 		$uref = Route::User->new($ucall, $self->{call}, @_);
 		@out = $uref;
@@ -191,12 +191,6 @@ sub nodes
 	return @{$self->{nodes}};
 }
 
-sub parents
-{
-	my $self = shift;
-	return @{$self->{parent}};
-}
-
 sub rnodes
 {
 	my $self = shift;
@@ -219,7 +213,7 @@ sub new
 	confess "already have $call in $pkg" if $list{$call};
 	
 	my $self = $pkg->SUPER::new($call);
-	$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
+	$self->{dxchan} = ref $pkg ? [ $pkg->{call} ] : [ ];
 	$self->{version} = shift;
 	$self->{flags} = shift;
 	$self->{users} = [];
@@ -245,47 +239,6 @@ sub get_all
 	return values %list;
 }
 
-sub newid
-{
-	my $self = shift;
-	my $id = shift;
-	
-	return 0 if $id == $self->{lid};
-	if ($id > $self->{lid}) {
-		$self->{lid} = $id;
-		return 1;
-	} elsif ($self->{lid} - $id > 60000) {
-		$self->{id} = $id;
-		return 1;
-	}
-	return 0;
-}
-
-sub _addparent
-{
-	my $self = shift;
-    return $self->_addlist('parent', @_);
-}
-
-sub _delparent
-{
-	my $self = shift;
-    return $self->_dellist('parent', @_);
-}
-
-
-sub _addnode
-{
-	my $self = shift;
-    return $self->_addlist('nodes', @_);
-}
-
-sub _delnode
-{
-	my $self = shift;
-    return $self->_dellist('nodes', @_);
-}
-
 
 sub _adduser
 {
@@ -315,19 +268,16 @@ sub DESTROY
 sub AUTOLOAD
 {
 	no strict;
-
-	my $self = shift;
-	$name = $AUTOLOAD;
+	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
+	$name =~ s/^.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
 
 	# this clever line of code creates a subroutine which takes over from autoload
 	# from OO Perl - Conway
-#	print "AUTOLOAD: $AUTOLOAD\n";
-#	*{$AUTOLOAD} = sub {my $self = shift; @_ ? $self->{$name} = shift : $self->{$name}} ;
-    @_ ? $self->{$name} = shift : $self->{$name} ;
+        *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+        goto &$AUTOLOAD;
 }
 
 1;