fix Route::findroutes?

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index e1b31bafbdf50ee15b27b46e7ee83f92ffc446ed..d4ef2c1d849b40fe46abbe03a3c5a9753ca658c5 100644 (file)
--- 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 2c53175fc645b13f4e0f6a6310d97cf7e4f3c8af..860c5235176449a59a8842b798785a16d8c47ae4 100644 (file)
--- 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 87cfd674cf0e85ca8fcc7efd40eebd4632bf08b1..dbe3382feef8f5a9c681886a698e0c6b125b0209 100644 (file)
--- 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;