X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=23e293820295f6c8f4379373e8a85ae5c0481181;hb=f4c54c5174d50224a745d5ed71ad1563a9440083;hp=581c570f36861a34031d6473cba3a55fee620415;hpb=d3641e4f287c5268bafda521f3bd9cd0080e6165;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 581c570f..23e29382 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Route::Node;
@@ -32,6 +32,7 @@ use vars qw(%list %valid @ISA $max $filterdef $obscount);
 		  via_pc92 => '0,Came in via pc92,yesno',
 		  obscount => '0,Obscount',
 		  last_PC92C => '9,Last PC92C',
+		  PC92C_dxchan => '9,Channel of PC92C',
 );
 
 $filterdef = $Route::filterdef;
@@ -106,23 +107,35 @@ sub del
 			push @nodes, $r->del($self, $ncall, @_) if $r;
 		}
 		$self->_del_users;
-		delete $list{$self->{call}};
+		delete $list{$ncall};
 		push @nodes, $self;
 	}
 	return @nodes;
 }
 
 # this deletes this node completely by grabbing the parents
-# and deleting me from them
+# and deleting me from them, then deleting me from all the
+# dependent nodes.
 sub delete
 {
 	my $self = shift;
 	my @out;
+	my $ncall = $self->{call};
 
+	# get rid of users and parents
 	$self->_del_users;
-	foreach my $call (@{$self->{parent}}) {
-		my $parent = Route::Node::get($call);
-		push @out, $parent->del($self) if $parent;
+	if (@{$self->{parent}}) {
+		foreach my $call (@{$self->{parent}}) {
+			my $parent = Route::Node::get($call);
+			push @out, $parent->del($self) if $parent;
+		}
+	}
+	# get rid of my nodes
+	push @out, $self->del_nodes;
+	# this only happens if we a orphan with no parents
+	if ($list{$ncall}) {
+		push @out, $self;
+		delete $list{$ncall};
 	}
 	return @out;
 }
@@ -273,7 +286,7 @@ sub new
 	$self->{flags} = shift || Route::here(1);
 	$self->{users} = [];
 	$self->{nodes} = [];
-	$self->{lastid} = {};
+	$self->{PC92C_dxchan} = '';
 	$self->reset_obs;			# by definition
 
 	$list{$call} = $self;
@@ -346,6 +359,18 @@ sub reset_obs
 	$self->{obscount} = $obscount;
 }
 
+sub measure_pc9x_t
+{
+	my $parent = shift;
+	my $t = shift;
+	my $lastid = $parent->{lastid};
+	if ($lastid) {
+		return ($t < $lastid) ? $t+86400-$lastid : $t - $lastid;
+	} else {
+		return 86400;
+	}
+}
+
 sub DESTROY
 {
 	my $self = shift;