X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=e50302cd1b494e65a16fa04f3befb37e1b1c4337;hb=aeb4c8591de710bd8de14f33817d2f0aabbd5e28;hp=ee1c9140ca3facb8a5dad741d8c8ace4f3ab1ec8;hpb=bfb3961b8ac7b159ef8155361003bfdd9d26dfad;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index ee1c9140..e50302cd 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -113,6 +113,21 @@ sub del
 	return @nodes;
 }
 
+# this deletes this node completely by grabbing the parents
+# and deleting me from them
+sub delete
+{
+	my $self = shift;
+	my @out;
+	
+	$self->_del_users;
+	foreach my $call (@{$self->{parent}}) {
+		my $parent = Route::Node::get($call);
+		push @out, $parent->del($self) if $parent;
+	}
+	return @out;
+}
+
 sub del_nodes
 {
 	my $parent = shift;
@@ -224,11 +239,25 @@ sub calc_config_changes
 	my %users = map {$_ => 1} @{$self->{users}};
 	my $cnodes = shift;
 	my $cusers = shift;
+	if (isdbg('route')) {
+		dbg("ROUTE: start calc_config_changes");
+		dbg("ROUTE: incoming nodes on $self->{call}: " . join(',', sort @$cnodes));
+		dbg("ROUTE: incoming users on $self->{call}: " . join(',', sort @$cusers));
+		dbg("ROUTE: existing nodes on $self->{call}: " . join(',', sort keys %nodes));
+		dbg("ROUTE: existing users on $self->{call}: " . join(',', sort keys %users));
+	}
 	my (@dnodes, @dusers, @nnodes, @nusers);
 	push @nnodes, map {my @r = $nodes{$_} ? () : $_; delete $nodes{$_}; @r} @$cnodes;
 	push @dnodes, keys %nodes;
 	push @nusers, map {my @r = $users{$_} ? () : $_; delete $users{$_}; @r} @$cusers;
 	push @dusers, keys %users;
+	if (isdbg('route')) {
+		dbg("ROUTE: deleted nodes on $self->{call}: " . join(',', sort @dnodes));
+		dbg("ROUTE: deleted users on $self->{call}: " . join(',', sort @dusers));
+		dbg("ROUTE: added nodes on $self->{call}: " . join(',', sort  @nnodes));
+		dbg("ROUTE: added users on $self->{call}: " . join(',', sort @nusers));
+		dbg("ROUTE: end calc_config_changes");
+	}
 	return (\@dnodes, \@dusers, \@nnodes, \@nusers);
 }