X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=89c8452ea56927a9d05bef9414efe45b870a2b4f;hb=9311d6940faf0e9952d6d65d9ead572b06a52434;hp=807e414e2895a5f9892ea91c8a2fba7dbd746bfe;hpb=27b6e9691f9985830388bbb8fc0a04357fa4f11f;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 807e414e..89c8452e 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -30,26 +30,31 @@ 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};
 }
 
 sub from_Aranea
 {
 	my $thing = shift;
-	return unless $thing;
+	$thing->{u} ||= '';
+	$thing->{n} ||= '';
+	$thing->{a} ||= '';
 	return $thing;
 }
 
@@ -86,36 +91,35 @@ sub handle_cf
 	}
 
 	# do nodes
-	my ($del, $add);
 	my %in;
 	if ($thing->{n}) {
-		%in = (map {my ($here, $call) = unpack("A1 A*", $_); ($call, $here)} split /:/, $thing->{n});
-		my ($tdel, $tadd) = $parent->diff_nodes(keys %in);
-		$add = $tadd;
-		$del = $tdel;
+		for (split(/:/, $thing->{n})) {
+			my ($here, $call) = unpack("A1 A*", $_); 
+			$in{$call} = $here;
+		}
 	}
 	if ($thing->{a}) {
-		%in = (map {my ($here, $call) = unpack("A1 A*", $_); ($call, $here)} split /:/, $thing->{a});
-		my ($tdel, $tadd) = $parent->diff_nodes(keys %in);
-		push @$add, @$tadd;
-		push @$del, @$tdel;
+		for (split(/:/, $thing->{a})) {
+			my ($here, $call) = unpack("A1 A*", $_); 
+			$in{$call} = $here;
+		} 
 	}
-	if (@$add || @$del) {
-		my $call;
-
+	my ($del, $add) = $parent->diff_nodes(keys %in);
+	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;
+			my $here = $in{$call};
+			push @pc19, $parent->add($call, 0, $here);
 		}
 		$thing->{pc19n} = \@pc19 if @pc19;
 	}
@@ -158,23 +162,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_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
 {
@@ -240,6 +227,21 @@ sub new_cf
 	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 if @u;
+	return @u;
+}