projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix showdx, is_ipaddr, create_master_badip_files.pl
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index b04536e4bc2e374f8b4be35f788bef16d9848181..c4f31232ea0ce2537d6b0bc8ee0f395f74b8399f 100644
(file)
--- 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});
$self->state('init');
my $parent = Route::Node::get($self->{call});
-
+
+ my ($software, $version, $build) = (undef, 0, 0);
+
# record the type and version offered
# 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;
$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/;
$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);
dbg("$self->{call} = $software version $version build $build");
$self->{version} = $version;
$self->user->version($version);