X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=362904d01cac4b311eb2679e379f0afbea16f25e;hb=24e7cdb8b2479635fc99952e007bfc6c4c7f6a9a;hp=6207635aac912ba03f071aa493d9c4a88c5a1fce;hpb=4f2b8661933ee3e3ccda2596d30485d98dd18ecb;p=spider.git

diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index 6207635a..362904d0 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -24,12 +24,16 @@ use Thingy;
 use Thingy::RouteFilter;
 use Spot;
 
-use vars qw(@ISA);
+use vars qw(@ISA $update_interval);
 @ISA = qw(Thingy Thingy::RouteFilter);
 
+$update_interval = 30 * 60;		# the interval between 'cf' updates for an interface
+
 sub gen_Aranea
 {
 	my $thing = shift;
+	my $dxchan = shift;
+	
 	unless ($thing->{Aranea}) {
 		my $ref;
 		if ($ref = $thing->{anodes}) {
@@ -43,6 +47,7 @@ sub gen_Aranea
 		}
 	 	$thing->{Aranea} = Aranea::genmsg($thing, [qw(s a n u)]);
 	}
+	
  	return $thing->{Aranea};
 }
 
@@ -100,19 +105,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;
@@ -236,8 +240,7 @@ sub copy_pc16_data
 
 	my @u = $uref->users;
 	if (@u) {
-		$thing->{pc16n} = $uref;
-		$thing->{pc16u} = [map {Route::User::get($_)} @u];
+		$thing->{ausers} = [map {Route::User::get($_)} @u];
 		return scalar @u;
 	}
 	return undef;