projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1540cc
)
allow users of next door nodes to override search
author
Dirk Koopman
<djk@tobit.co.uk>
Tue, 24 Jun 2008 19:24:53 +0000
(20:24 +0100)
committer
Dirk Koopman
<djk@tobit.co.uk>
Tue, 24 Jun 2008 19:24:53 +0000
(20:24 +0100)
perl/Route.pm
patch
|
blob
|
history
perl/Version.pm
patch
|
blob
|
history
diff --git
a/perl/Route.pm
b/perl/Route.pm
index 3301099890e23214948639c8aa28c667bc52dbfd..794b8d3d71e15084a36d6854a81bf4129e33a49e 100644
(file)
--- a/
perl/Route.pm
+++ b/
perl/Route.pm
@@
-291,12
+291,11
@@
sub findroutes
my $call = shift;
my @out;
my $call = shift;
my @out;
- dbg("ROUTE: findroutes
:
$call") if isdbg('findroutes');
+ dbg("ROUTE: findroutes $call") if isdbg('findroutes');
# return immediately if we are directly connected
# return immediately if we are directly connected
- if (my $dxchan = DXChannel::get($call)) {
- return $dxchan;
- }
+ my $dxchan = DXChannel::get($call);
+ return $dxchan if $dxchan;
my $nref = Route::get($call);
return () unless $nref;
my $nref = Route::get($call);
return () unless $nref;
@@
-305,6
+304,10
@@
sub findroutes
my @parent = $nref->isa('Route::User') ? @{$nref->{parent}} : $call;
my %cand;
foreach my $p (@parent) {
my @parent = $nref->isa('Route::User') ? @{$nref->{parent}} : $call;
my %cand;
foreach my $p (@parent) {
+ # return immediately if we are directly connected or a user's parent node is
+ $dxchan = DXChannel::get($p);
+ return $dxchan if $dxchan;
+
my $r = Route::Node::get($p);
if ($r) {
my %r = $r->PC92C_dxchan;
my $r = Route::Node::get($p);
if ($r) {
my %r = $r->PC92C_dxchan;
@@
-326,7
+329,7
@@
sub findroutes
if (isdbg('findroutes')) {
if (@out) {
foreach (sort {$b->[0] <=> $a->[0]} @out) {
if (isdbg('findroutes')) {
if (@out) {
foreach (sort {$b->[0] <=> $a->[0]} @out) {
- dbg("ROUTE: findroute $call -> $_->[0] " . $_->[1]->call);
+ dbg("ROUTE: findroute
s
$call -> $_->[0] " . $_->[1]->call);
}
}
}
}
}
}
diff --git
a/perl/Version.pm
b/perl/Version.pm
index aada260148673cc5625793a0c298663840c97280..6673aff64c8afa91077afa7518d227e83c99cbb5 100644
(file)
--- a/
perl/Version.pm
+++ b/
perl/Version.pm
@@
-11,6
+11,6
@@
use vars qw($version $subversion $build);
$version = '1.55';
$subversion = '0';
$version = '1.55';
$subversion = '0';
-$build = '1
4
';
+$build = '1
5
';
1;
1;