version 1.1, 2013/02/02 00:22:43
|
version 1.2, 2013/02/02 15:20:02
|
Line 124 sub get_checksums {
|
Line 124 sub get_checksums {
|
|
|
sub compare_checksums { |
sub compare_checksums { |
my ($target,$lonhost,$version,$serversums,$serverversions) = @_; |
my ($target,$lonhost,$version,$serversums,$serverversions) = @_; |
my ($message,$numchg); |
my ($message,$numchg,$linefeed); |
|
if ($target = 'web') { |
|
$linefeed = '<br />'; |
|
} else { |
|
$linefeed = "\n"; |
|
} |
if ((ref($serversums) eq 'HASH') && (keys(%{$serversums}))) { |
if ((ref($serversums) eq 'HASH') && (keys(%{$serversums}))) { |
my $checksums = &Apache::lonnet::fetch_dns_checksums(); |
my $checksums = &Apache::lonnet::fetch_dns_checksums(); |
my (%extra,%missing,%diffs,%stdsums,%stdversions); |
my (%extra,%missing,%diffs,%stdsums,%stdversions); |
Line 155 sub compare_checksums {
|
Line 160 sub compare_checksums {
|
} |
} |
} |
} |
if ($numchg) { |
if ($numchg) { |
$message = |
$message = |
&Apache::lonlocal::mt('[quant,_1,difference was,differences were] found'. |
&Apache::lonlocal::mt('[quant,_1,difference was,differences were] found'. |
' between LON-CAPA modules installed on your server ([_2])'. |
' between LON-CAPA modules installed on your server [_2]'. |
' and those expected for the LON-CAPA version ([_3])'. |
' and those expected for the LON-CAPA version you are'. |
' which you are running.',$numchg,$lonhost,$version); |
' currently running.',$numchg,"($lonhost)$linefeed"); |
if ($target eq 'web') { |
if ($target eq 'web') { |
$message = '<p>'.$message.'</p>'; |
$message = '<p>'.$message.'</p>'; |
} else { |
} else { |
Line 175 sub compare_checksums {
|
Line 180 sub compare_checksums {
|
} |
} |
} |
} |
if (@diffversion > 0) { |
if (@diffversion > 0) { |
my $text = |
my $text = |
&Apache::lonlocal::mt('The following [quant,_1,local file is a,local files are]'. |
&Apache::lonlocal::mt('The following [quant,_1,file is a,files are]'. |
' different version(s) from that expected for LON-CAPA [_2]:', |
' different version(s) from that expected for LON-CAPA [_2]:', |
scalar(@diffversion),$version); |
scalar(@diffversion),$version); |
if ($target eq 'web') { |
if ($target eq 'web') { |
Line 194 sub compare_checksums {
|
Line 199 sub compare_checksums {
|
my $revnum = $stdversions{$file}; |
my $revnum = $stdversions{$file}; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$message .= &Apache::loncommon::start_data_table_row(). |
$message .= &Apache::loncommon::start_data_table_row(). |
'<td>'.$file.'<td>'."\n". |
'<td>'.$file.'</td>'."\n". |
'<td>'.$serverversions->{$file}.'</td>'."\n". |
'<td>'.$serverversions->{$file}.'</td>'."\n". |
'<td>'.$revnum.'</td>'."\n". |
'<td>'.$revnum.'</td>'."\n". |
&Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
Line 210 sub compare_checksums {
|
Line 215 sub compare_checksums {
|
$message .= "\n"; |
$message .= "\n"; |
} |
} |
} |
} |
|
if ($target eq 'web') { |
|
$message .= &Apache::loncommon::end_data_table().'<br />'; |
|
} else { |
|
$message .= "\n"; |
|
} |
} |
} |
if (@modified > 0) { |
if (@modified > 0) { |
my $text = |
my $text = |
&Apache::lonlocal::mt('The following [quant,_1,file appears,files appear]'. |
&Apache::lonlocal::mt('The following [quant,_1,file appears,files appear]'. |
' to have been modified locally:',scalar(@modified)); |
' to have been modified locally:',scalar(@modified)); |
if ($target eq 'web') { |
if ($target eq 'web') { |
Line 238 sub compare_checksums {
|
Line 248 sub compare_checksums {
|
"\n"; |
"\n"; |
} |
} |
} |
} |
|
if ($target eq 'web') { |
|
$message .= &Apache::loncommon::end_data_table().'<br />'; |
|
} else { |
|
$message .= "\n"; |
|
} |
} |
} |
} |
} |
if (keys(%missing) > 0) { |
if (keys(%missing) > 0) { |
Line 257 sub compare_checksums {
|
Line 272 sub compare_checksums {
|
foreach my $file (sort(keys(%missing))) { |
foreach my $file (sort(keys(%missing))) { |
my $revnum = $stdversions{$file}; |
my $revnum = $stdversions{$file}; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$message .= '<td>'.$file.'<td>'."\n". |
$message .= '<td>'.$file.'</td>'."\n". |
'<td>'.$revnum.'</td>'."\n". |
'<td>'.$revnum.'</td>'."\n". |
&Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
} else { |
} else { |
Line 270 sub compare_checksums {
|
Line 285 sub compare_checksums {
|
$message .= "\n"; |
$message .= "\n"; |
} |
} |
} |
} |
|
if ($target eq 'web') { |
|
$message .= &Apache::loncommon::end_data_table(); |
|
} else { |
|
$message .= "\n"; |
|
} |
} |
} |
if (keys(%extra) > 0) { |
if (keys(%extra) > 0) { |
my $text = |
my $text = |
Line 288 sub compare_checksums {
|
Line 308 sub compare_checksums {
|
} |
} |
foreach my $file (sort(keys(%extra))) { |
foreach my $file (sort(keys(%extra))) { |
if ($target eq 'web') { |
if ($target eq 'web') { |
$message .= '<td>'.$file.'<td>'."\n". |
$message .= '<td>'.$file.'</td>'."\n". |
'<td>'.$serverversions->{$file}.'</td>'."\n". |
'<td>'.$serverversions->{$file}.'</td>'."\n". |
&Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
} else { |
} else { |
Line 298 sub compare_checksums {
|
Line 318 sub compare_checksums {
|
"\n"; |
"\n"; |
} |
} |
} |
} |
|
if ($target eq 'web') { |
|
$message .= &Apache::loncommon::end_data_table().'<br />'; |
|
} else { |
|
$message .= "\n"; |
|
} |
} |
} |
} else { |
} else { |
$message = &Apache::lonlocal::mt('No differences detected between installed files and files expected for LON-CAPA [_1]',$version); |
$message = &Apache::lonlocal::mt('No differences detected between installed files and files expected for LON-CAPA [_1]',$version); |