loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

version 1.1056.4.6, 2010/08/17 01:49:04	version 1.1056.4.7, 2010/08/18 12:22:39
Line 222 sub get_server_loncaparev {	Line 222 sub get_server_loncaparev {
my @ids=&current_machine_ids();	my @ids=&current_machine_ids();
if (grep(/^\Q$lonhost\E$/,@ids)) {	if (grep(/^\Q$lonhost\E$/,@ids)) {
$answer = $perlvar{'lonVersion'};	$answer = $perlvar{'lonVersion'};
if ($answer =~ /^[\'\"]?([\d.\-]+)[\'\"]?$/) {	if ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
$loncaparev = $1;	$loncaparev = $1;
}	}
} else {	} else {
Line 238 sub get_server_loncaparev {	Line 238 sub get_server_loncaparev {
my $response=$ua->request($request);	my $response=$ua->request($request);
unless ($response->is_error()) {	unless ($response->is_error()) {
my $content = $response->content;	my $content = $response->content;
if ($content =~ /<p>VERSION\:\s*([\d.\-]+)<\/p>/) {	if ($content =~ /<p>VERSION\:\s*([\w.\-]+)<\/p>/) {
$loncaparev = $1;	$loncaparev = $1;
}	}
}	}
} else {	} else {
$loncaparev = $loncaparevs{$lonhost};	$loncaparev = $loncaparevs{$lonhost};
}	}
} elsif ($answer =~ /^[\'\"]?([\d.\-]+)[\'\"]?$/) {	} elsif ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
$loncaparev = $1;	$loncaparev = $1;
}	}
}	}