From: Dirk Koopman Date: Sat, 23 Jun 2007 23:21:06 +0000 (+0100) Subject: fix Route::findroutes? X-Git-Tag: 1.55~138 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=28f251eee8a08f65460a0f1b1b66cf30f5fc08db;p=spider.git fix Route::findroutes? --- diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index e1b31baf..d4ef2c1d 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -598,16 +598,15 @@ sub handle_18 my $parent = Route::Node::get($self->{call}); # record the type and version offered - if ($_[1] =~ /DXSpider Version: (\d+\.\d+)/) { - $self->{version} = 53 + $1; - $self->user->version(53 + $1); - $parent->version(0 + $1); - dbg("DXSpider version $1"); + if (my ($version) = $_[1] =~ /DXSpider Version: (\d+\.\d+)/) { + $self->{version} = 53 + $version; + $self->user->version(53 + $version); + $parent->version(0 + $version); my ($build) = $_[1] =~ /Build: (\d+(?:\.\d+)?)/; $self->{build} = 0 + $build; $self->user->build(0 + $build); $parent->build(0 + $build); - dbg("DXSpider build $build"); + dbg("DXSpider version $version build $build"); unless ($self->is_spider) { dbg("Change U " . $self->user->sort . " C $self->{sort} -> S"); $self->user->sort('S'); diff --git a/perl/Route.pm b/perl/Route.pm index 2c53175f..860c5235 100644 --- a/perl/Route.pm +++ b/perl/Route.pm @@ -301,6 +301,7 @@ sub findroutes push @out, $level ? [$level, $dxchan] : $dxchan; return @out; } + $seen->{$call}++; # deal with more nodes my $nref = Route::get($call); diff --git a/perl/Version.pm b/perl/Version.pm index 87cfd674..dbe3382f 100644 --- a/perl/Version.pm +++ b/perl/Version.pm @@ -11,6 +11,6 @@ use vars qw($version $subversion $build); $version = '1.54'; $subversion = '0'; -$build = '76'; +$build = '77'; 1;