X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=bdc4bf41de4415d27d5b05517d34de5ecf1f1643;hb=f4fd2e96d56ed980113fddfd969587681eb414cf;hp=bc6228b112b9c568149ea3ca78d3260366445875;hpb=e2e4dadc448747744dacc0eb8d99ee950529a9b3;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index bc6228b1..bdc4bf41 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -30,19 +30,22 @@ use vars qw(@ISA);
 sub gen_Aranea
 {
 	my $thing = shift;
+	my $dxchan = shift;
+	
 	unless ($thing->{Aranea}) {
 		my $ref;
 		if ($ref = $thing->{anodes}) {
-			$thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+			$thing->{a} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
-		if ($ref = $thing->{anodes}) {
-			$thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+		if ($ref = $thing->{pnodes}) {
+			$thing->{n} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
 		if ($ref = $thing->{ausers}) {
-			$thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref);
+			$thing->{u} = join(':', map {"$_->{flags}$_->{call}"} @$ref) || '';
 		}
 	 	$thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
 	}
+	
  	return $thing->{Aranea};
 }
 
@@ -100,19 +103,18 @@ sub handle_cf
 		push @$add, @$tadd;
 		push @$del, @$tdel;
 	}
-	if (@$add || @$del) {
-		my $call;
-
+	if ($add) {
 		my @pc21;
-		foreach $call (@$del) {
+		foreach my $call (@$del) {
 			RouteDB::delete($call, $chan_call);
 			my $ref = Route::Node::get($call);
 			push @pc21, $ref->del($parent) if $ref;
 		}
 		$thing->{pc21n} = \@pc21 if @pc21;
-		
+	}
+	if ($del) {
 		my @pc19;
-		foreach $call (@$add) {
+		foreach my $call (@$add) {
 			RouteDB::update($call, $chan_call);
 			my $ref = Route::Node::get($call);
 			push @pc19, $parent->add($call, 0, $in{$call}) unless $ref;
@@ -158,23 +160,6 @@ sub handle_cf
 	return $thing;
 }
 
-# 
-# copy out the PC16 data for a node into the
-# pc16n and u slots if there are any users 
-#
-sub copy_node_pc16_data
-{
-	my $thing = shift;
-	my $uref = shift;
-	
-	my @u = $uref->users;
-	if (@u) {
-		$thing->{pc16n} = $uref;
-		$thing->{pc16u} = [map {Route::User::get($_)} @u];
-		return scalar @u;
-	}
-	return undef;
-}
 
 sub _add_user
 {
@@ -210,7 +195,7 @@ sub _upd_user_rec
 # info whenever a node connects and also periodically.
 #
 
-sub new_lcf
+sub new_cf
 {
 	my $pkg = shift;
 	my $thing = $pkg->SUPER::new(@_);
@@ -240,6 +225,21 @@ sub new_lcf
 	return $thing;
 }
 
+# 
+# copy out the PC16 data for a node into the
+# pc16n and u slots if there are any users 
+#
+sub copy_pc16_data
+{
+	my $thing = shift;
+	my $uref = shift;
+
+	$thing->{'s'} = 'cf';
+
+	my @u = map {Route::User::get($_)} $uref->users;
+	$thing->{ausers} = \@u;
+	return @u;
+}