--- loncom/configuration/Checksumming.pm 2013/02/02 15:20:02 1.2 +++ loncom/configuration/Checksumming.pm 2013/06/29 16:59:09 1.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Checksum installed LON-CAPA modules and some configuration files # -# $Id: Checksumming.pm,v 1.2 2013/02/02 15:20:02 raeburn Exp $ +# $Id: Checksumming.pm,v 1.6 2013/06/29 16:59:09 raeburn Exp $ # # The LearningOnline Network with CAPA # @@ -85,7 +85,7 @@ sub get_checksums { } if (@paths) { my $pathstr = join (' ',@paths); - if (open($dirh,"grep '$revtag' $pathstr |")) { + if (open($dirh,"grep '$revtag' $pathstr 2>&1 |")) { while (my $line=<$dirh>) { if ($line =~ m{^([^#]+):#\s\\s[\w.]+,v\s([\d.]+)\s}) { $versions{$1} = $2; @@ -125,11 +125,14 @@ sub get_checksums { sub compare_checksums { my ($target,$lonhost,$version,$serversums,$serverversions) = @_; my ($message,$numchg,$linefeed); - if ($target = 'web') { + if ($target eq 'web') { $linefeed = '
'; } else { $linefeed = "\n"; } + if (!$Apache::lonlocal::lh) { + &Apache::lonlocal::get_language_handle(); + } if ((ref($serversums) eq 'HASH') && (keys(%{$serversums}))) { my $checksums = &Apache::lonnet::fetch_dns_checksums(); my (%extra,%missing,%diffs,%stdsums,%stdversions); @@ -148,8 +151,10 @@ sub compare_checksums { $numchg ++; } } else { - $missing{$key} = 1; - $numchg ++; + unless ((-e $key) && (-B $key)) { + $missing{$key} = 1; + $numchg ++; + } } } foreach my $key (keys(%{$serversums})) { @@ -272,7 +277,8 @@ sub compare_checksums { foreach my $file (sort(keys(%missing))) { my $revnum = $stdversions{$file}; if ($target eq 'web') { - $message .= ''.$file.''."\n". + $message .= &Apache::loncommon::start_data_table_row()."\n". + ''.$file.''."\n". ''.$revnum.''."\n". &Apache::loncommon::end_data_table_row()."\n"; } else { @@ -308,7 +314,8 @@ sub compare_checksums { } foreach my $file (sort(keys(%extra))) { if ($target eq 'web') { - $message .= ''.$file.''."\n". + $message .= &Apache::loncommon::start_data_table_row()."\n". + ''.$file.''."\n". ''.$serverversions->{$file}.''."\n". &Apache::loncommon::end_data_table_row()."\n"; } else {