X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FThingy.pm;h=afc2129b913641eaaaf641330781de873bc535cd;hb=f84b188c092d48648c16f3174b293b32d8f5bd6a;hp=efacdbb3219f0864a587098e841229abd404ee8a;hpb=b03b8dda6a611e21b9e3d9c632c9a5fd68c36129;p=spider.git diff --git a/perl/Thingy.pm b/perl/Thingy.pm index efacdbb3..afc2129b 100644 --- a/perl/Thingy.pm +++ b/perl/Thingy.pm @@ -78,7 +78,7 @@ sub send # function must return true to make the send happen $sub = "before_send_$class"; if ($thing->can($sub)) { - return $thing->$sub($dxchan); + return unless $thing->$sub($dxchan); } # generate the protocol line which may (or not) be cached @@ -113,7 +113,8 @@ sub broadcast dbg("Thingy::broadcast: " . $thing->ascii) if isdbg('thing'); my @dxchan; - my $to ||= $thing->{touser}; + my $to ||= $thing->{route}; + $to ||= $thing->{touser}; $to ||= $thing->{group}; if ($to && is_callsign($to) && (my $ref = Route::get($to))) { dbg("Thingy::broadcast: routing for $to") if isdbg('thing'); @@ -217,7 +218,7 @@ sub ascii my $dd = new Data::Dumper([$thing]); $dd->Indent(0); $dd->Terse(1); - $dd->Sortkeys(1); + #$dd->Sortkeys(1); $dd->Quotekeys($] < 5.005 ? 1 : 0); return $dd->Dumpxs; }