X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy%2FRt.pm;h=554d171aea445f9ed6d65e231d6b3881eb102d44;hb=de7f7dbbadcad48ba245f22db044b14954e18782;hp=4b533445a68ee42e1ce5dba88c80e473b86d33cc;hpb=1b51ec2cbffe9df6d7650d3daabec0885ddd7695;p=spider.git diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm index 4b533445..554d171a 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); + $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}; } @@ -233,13 +236,9 @@ sub copy_pc16_data $thing->{'s'} = 'cf'; - my @u = $uref->users; - if (@u) { - $thing->{pc16n} = $uref; - $thing->{pc16u} = [map {Route::User::get($_)} @u]; - return scalar @u; - } - return undef; + my @u = map {Route::User::get($_)} $uref->users; + $thing->{ausers} = \@u; + return @u; }