--- loncom/publisher/londiff.pm 2001/12/13 14:02:54 1.7 +++ loncom/publisher/londiff.pm 2009/05/14 14:24:18 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.7 2001/12/13 14:02:54 harris41 Exp $ +# $Id: londiff.pm,v 1.27 2009/05/14 14:24:18 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,183 +25,216 @@ # # http://www.lon-capa.org/ # -# -# (Handler to retrieve an old version of a file -# -# (Publication Handler -# -# (TeX Content Handler -# -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer -# 03/23 Guy Albertelli -# 03/24,03/29 Gerd Kortemeyer) -# -# 03/31,04/03 Gerd Kortemeyer) -# -# 05/02/01,05/09 Gerd Kortemeyer -# 12/13 Scott Harrison -# ### + + + package Apache::londiff; use strict; use Apache::File; use File::Copy; +use File::Compare; use Algorithm::Diff qw(diff); use Apache::Constants qw(:common :http :methods); -use Apache::loncacc; -use Apache::lonnet(); +use Apache::loncacc(); +use Apache::lonnet; use Apache::loncommon(); +use Apache::lonretrieve(); +use Apache::lonlocal; +use LONCAPA(); + +sub get_split_file { + my ($fn,$style)=@_; + my $f1; + my @f1; + if ($style eq 'local') { + if (-e $fn) { + my $fh=Apache::File->new($fn); + my $line; + while($line=<$fh>) { + $f1.=$line; + } + } + } elsif ($style eq 'remote') { + $f1=&Apache::lonnet::getfile($fn); + } + @f1=split(/\r\n|\r|\n/,$f1); + return @f1; +} -sub handler { +sub are_different_files { + my ($fileone,$filetwo)=@_; + return &compare($fileone,$filetwo); +} - my $r=shift; +sub handler { + my $r=shift; # Get query string for limited number of parameters - foreach (split(/&/,$ENV{'QUERY_STRING'})) { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name eq 'filename') || ($name eq 'versiontwo') || - ($name eq 'versionone')) { - unless ($ENV{'form.'.$name}) { - $ENV{'form.'.$name}=$value; - } - } - } - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['filename','versiontwo', + 'versionone','filetwo']); # Get the files - my $cuname=$ENV{'user.name'}; - my $cudom=$ENV{'user.domain'}; - - unless (($cuname,$cudom)= - &Apache::loncacc::constructaccess($ENV{'form.filename'}, - $r->dir_config('lonDefDomain'))) { - $r->log_reason($cuname.' at '.$cudom. - ' trying to get diffs file '.$ENV{'form.filename'}. - ' - not authorized', - $r->filename); - return HTTP_NOT_ACCEPTABLE; - } - - my $efn=$ENV{'form.filename'}; + my $cuname=$env{'user.name'}; + my $cudom=$env{'user.domain'}; - $efn=~s/\/\~(\w+)//g; - - my @f1=(); - my @f2=(); + if ($env{'form.filename'}=~/^\/res\//) { + ($cudom,$cuname,$env{'form.filename'})= + ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$}); + } else { + unless (($cuname,$cudom)= + &Apache::loncacc::constructaccess($env{'form.filename'}, + $r->dir_config('lonDefDomain'))) { + $r->log_reason($cuname.':'.$cudom. + ' trying to get diffs file '.$env{'form.filename'}. + ' - not authorized', + $r->filename); + return HTTP_NOT_ACCEPTABLE; + } + } + + my $efn=$env{'form.filename'}; - $r->content_type('text/html'); - $r->send_http_header; + $efn=~s{/\~($LONCAPA::username_re)}{}g; - $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>'); + my @f1=(); + my @f2=(); - $r->print('<body bgcolor="#FFFFFF">'); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::loncommon::start_page('Resource Differences',undef, + {'no_nav_bar' => 1, })); - $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>'); + $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')). + ' <span class="LC_filename">'.$efn.'</span>'); - if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) { - $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom. - '</font></h3>'); - } - - - if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq - 'ssi') { - if ($ENV{'form.versionone'} eq 'priv') { - my $fn='/home/'.$cuname.'/public_html/'.$efn; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f1[$#f1+1]=$line; - } - } - $r->print('<h3>Construction Space Version</h3>'); - } else { - my $fn= - '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/'; - if ($ENV{'form.versionone'}) { - my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/); - $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix; - $r->print('<h3>Version '.$ENV{'form.versionone'}.'</h3>'); - } else { - $fn.=$efn; - $r->print('<h3>Current Version</h3>'); - } - @f1=split(/\n/,&Apache::lonnet::getfile($fn)); - } - - $r->print('versus'); - - if ($ENV{'form.versiontwo'} eq 'priv') { - my $fn='/home/'.$cuname.'/public_html/'.$efn; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f2[$#f2+1]=$line; - } - } - $r->print('<h3>Construction Space Version</h3>'); - } else { - my $fn= - '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; - if ($ENV{'form.versiontwo'}) { - my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/); - $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix; - $r->print('<h3>Version '.$ENV{'form.versiontwo'}.'</h3>'); - } else { - $fn.=$efn; - $r->print('<h3>Current Version</h3>'); - } - @f2=split(/\n/,&Apache::lonnet::getfile($fn)); - } + if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { + $r->print('<p><span class="LC_warning">' + .&mt('Co-Author [_1]' + ,&Apache::loncommon::plainname($cuname,$cudom) + .' ('.$cuname.':'.$cudom.')') + .'</span></p>' + ); + } + + if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' + || $efn =~ /\.meta$/) { + $r->print('<p><span class="LC_diff_removed">'); + if ($env{'form.versionone'} eq 'priv') { + my $fn='/home/'.$cuname.'/public_html/'.$efn; + @f1=&get_split_file($fn,'local'); + $r->print('<b>'.&mt('Construction Space Version').'</b>'); + } else { + my $fn= + '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; + if ($env{'form.versionone'}) { + my ($main,$suffix,$is_meta)= + &Apache::lonretrieve::get_file_info($efn); + + $fn.=($efn =~m|(.*/)[^/]+|)[0]; + # add on to $fn the path information in $efn + $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix; + $r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>'); + } else { + $fn.=$efn; + $r->print('<b>'.&mt('Current Version').'</b>'); + } + @f1=&get_split_file($fn,'remote'); + } + + $r->print('</span><br />'.&mt('versus').'<br /><span class="LC_diff_added">'); + + if ($env{'form.filetwo'}) { + my $efn2=$env{'form.filetwo'}; + $efn2=~s{/\~($LONCAPA::username_re)}{}g; + my $fn='/home/'.$cuname.'/public_html/'.$efn2; + @f2=&get_split_file($fn,'local'); + $r->print('<tt>'.$efn2.'</tt>'); + } elsif ($env{'form.versiontwo'} eq 'priv') { + my $fn='/home/'.$cuname.'/public_html/'.$efn; + @f2=&get_split_file($fn,'local'); + $r->print('<b>'.&mt('Construction Space Version').'</b>'); + } else { + my $fn= + '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; + if ($env{'form.versiontwo'}) { + my ($main,$suffix,$is_meta)= + &Apache::lonretrieve::get_file_info($efn); + # add on to $fn the path information in $efn + $fn.=($efn =~m|(.*/)[^/]+|)[0]; + $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix; + $r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>'); + } else { + $fn.=$efn; + $r->print('<b>'.&mt('Current Version').'</b>'); + } + @f2=&get_split_file($fn,'remote'); + } + $r->print('</span></p>'); # Run diff - my $diffs = diff(\@f1, \@f2); + my $diffs = diff(\@f1, \@f2); + + if (@$diffs) { + # Start page output + my $chunk; + my $line; + $r->print('<pre>'); + foreach $chunk (@$diffs) { + foreach $line (@$chunk) { + my ($sign, $lineno, $text) = @$line; + $text=&HTML::Entities::encode($text,'<>&"'); + $lineno=substr($lineno.' ',0,7); + $r->print('<span class="'.(($sign eq '+')?'LC_diff_added' + :'LC_diff_removed').'">'. + $sign.' '.$lineno.' '.$text."</span>\n"); + } + $r->print("</pre><hr /><pre>\n"); + } + $r->print('</pre>'); + } else { + $r->print('<p class="LC_info">'.&mt('No differences found').'</p>'); + } + } else { + $r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>'); + } + $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>'); + $r->print(&Apache::loncommon::end_page()); + return OK; +} + -# Start page output +1; +__END__ - my $chunk; - my $line; - $r->print('<pre>'); +=pod - foreach $chunk (@$diffs) { +=head1 NAME - foreach $line (@$chunk) { - my ($sign, $lineno, $text) = @$line; - $text=~s/\</\<\;/g; - $text=~s/\>/\>\;/g; - $lineno=substr($lineno.' ',0,7); - $r->print('<font color='.(($sign eq '+')?'green':'red').'>'. - $sign.' '.$lineno.' '.$text."</font>\n"); - } - $r->print("<hr>\n"); - } - $r->print('</pre>'); +Apache::londiff -} else { - $r->print('<h1><font color=red>Binary File</font></h1>'); -} - $r->print('</body></html>'); - return OK; -} +=head1 SYNOPSIS +Handler to show difference between two files. -1; -__END__ +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 Subroutines + +=over +=item get_split_file() +=item are_different_files() +=item handler() +=cut