X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=c4f31232ea0ce2537d6b0bc8ee0f395f74b8399f;hb=378cbf24f1b918e78d8b93c9e7ce3cf46fe28ec7;hp=b04536e4bc2e374f8b4be35f788bef16d9848181;hpb=d3568fec5fb3e19f72dc4813dd2e18a7031dd6bb;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index b04536e4..c4f31232 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -863,9 +863,11 @@ sub handle_18 $self->state('init'); my $parent = Route::Node::get($self->{call}); - + + my ($software, $version, $build) = (undef, 0, 0); + # record the type and version offered - if (my ($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) { + if (($software, $version) = $pc->[1] =~ /(DXSpider|CC\s*Cluster)\s+Version: (\d+(?:\.\d+)?)/i) { $version += 0; $version += 53 if $version < 6; $self->{version} = $version; @@ -885,7 +887,7 @@ sub handle_18 $self->sort('S'); } # $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/; - } elsif (my ($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) { + } elsif (($software, $version, $build) = $pc->[1] =~ /(AR-Cluster)\s+Version:\s+(\d+\.\d+).?(\d+\.\d+)?/) { dbg("$self->{call} = $software version $version build $build"); $self->{version} = $version; $self->user->version($version);