--- loncom/configuration/Checksumming.pm 2013/02/02 00:22:43 1.1
+++ loncom/configuration/Checksumming.pm 2013/02/02 15:20:02 1.2
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Checksum installed LON-CAPA modules and some configuration files
#
-# $Id: Checksumming.pm,v 1.1 2013/02/02 00:22:43 raeburn Exp $
+# $Id: Checksumming.pm,v 1.2 2013/02/02 15:20:02 raeburn Exp $
#
# The LearningOnline Network with CAPA
#
@@ -124,7 +124,12 @@ sub get_checksums {
sub compare_checksums {
my ($target,$lonhost,$version,$serversums,$serverversions) = @_;
- my ($message,$numchg);
+ my ($message,$numchg,$linefeed);
+ if ($target = 'web') {
+ $linefeed = '
';
+ } else {
+ $linefeed = "\n";
+ }
if ((ref($serversums) eq 'HASH') && (keys(%{$serversums}))) {
my $checksums = &Apache::lonnet::fetch_dns_checksums();
my (%extra,%missing,%diffs,%stdsums,%stdversions);
@@ -155,11 +160,11 @@ sub compare_checksums {
}
}
if ($numchg) {
- $message =
+ $message =
&Apache::lonlocal::mt('[quant,_1,difference was,differences were] found'.
- ' between LON-CAPA modules installed on your server ([_2])'.
- ' and those expected for the LON-CAPA version ([_3])'.
- ' which you are running.',$numchg,$lonhost,$version);
+ ' between LON-CAPA modules installed on your server [_2]'.
+ ' and those expected for the LON-CAPA version you are'.
+ ' currently running.',$numchg,"($lonhost)$linefeed");
if ($target eq 'web') {
$message = '
'.$message.'
'; } else { @@ -175,8 +180,8 @@ sub compare_checksums { } } if (@diffversion > 0) { - my $text = - &Apache::lonlocal::mt('The following [quant,_1,local file is a,local files are]'. + my $text = + &Apache::lonlocal::mt('The following [quant,_1,file is a,files are]'. ' different version(s) from that expected for LON-CAPA [_2]:', scalar(@diffversion),$version); if ($target eq 'web') { @@ -194,7 +199,7 @@ sub compare_checksums { my $revnum = $stdversions{$file}; if ($target eq 'web') { $message .= &Apache::loncommon::start_data_table_row(). - '