X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=4b533445a68ee42e1ce5dba88c80e473b86d33cc;hb=1b51ec2cbffe9df6d7650d3daabec0885ddd7695;hp=807e414e2895a5f9892ea91c8a2fba7dbd746bfe;hpb=27b6e9691f9985830388bbb8fc0a04357fa4f11f;p=spider.git diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm index 807e414e..4b533445 100644 --- a/perl/Thingy/Rt.pm +++ b/perl/Thingy/Rt.pm @@ -100,19 +100,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 +157,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 +222,25 @@ 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 = $uref->users; + if (@u) { + $thing->{pc16n} = $uref; + $thing->{pc16u} = [map {Route::User::get($_)} @u]; + return scalar @u; + } + return undef; +}