version 1.20, 2006/09/13 21:43:26
|
version 1.36, 2012/10/29 17:38:55
|
Line 27
|
Line 27
|
# |
# |
### |
### |
|
|
|
|
|
|
|
|
package Apache::londiff; |
package Apache::londiff; |
|
|
use strict; |
use strict; |
Line 35 use File::Copy;
|
Line 38 use File::Copy;
|
use File::Compare; |
use File::Compare; |
use Algorithm::Diff qw(diff); |
use Algorithm::Diff qw(diff); |
use Apache::Constants qw(:common :http :methods); |
use Apache::Constants qw(:common :http :methods); |
use Apache::loncacc(); |
|
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonretrieve(); |
use Apache::lonretrieve(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use LONCAPA(); |
|
|
sub get_split_file { |
sub get_split_file { |
my ($fn,$style)=@_; |
my ($fn,$style)=@_; |
Line 55 sub get_split_file {
|
Line 57 sub get_split_file {
|
} |
} |
} |
} |
} elsif ($style eq 'remote') { |
} elsif ($style eq 'remote') { |
my $f1=&Apache::lonnet::getfile($fn); |
$f1=&Apache::lonnet::getfile($fn); |
} |
|
if ($f1=~/\r/) { |
|
@f1=split(/\r/,&Apache::lonnet::getfile($fn)); |
|
foreach my $line (@f1) { |
|
$line=~s/\n//g; |
|
} |
|
} else { |
|
@f1=split(/\n/,&Apache::lonnet::getfile($fn)); |
|
} |
} |
|
@f1=split(/\r\n|\r|\n/,$f1); |
return @f1; |
return @f1; |
} |
} |
|
|
Line 75 sub are_different_files {
|
Line 70 sub are_different_files {
|
|
|
sub handler { |
sub handler { |
|
|
my $r=shift; |
my $r=shift; |
# Get query string for limited number of parameters |
# Get query string for limited number of parameters |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['filename','versiontwo','versionone','filetwo']); |
['filename','versiontwo', |
# Get the files |
'versionone','filetwo']); |
|
|
my $cuname=$env{'user.name'}; |
# Check permissions |
my $cudom=$env{'user.domain'}; |
my $allowed=0; |
|
my $cuname=$env{'user.name'}; |
if ($env{'form.filename'}=~/^\/res\//) { |
my $cudom=$env{'user.domain'}; |
($cudom,$cuname,$env{'form.filename'})= |
|
($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/); |
if ($env{'form.filename'}=~ m{^/res/}) { |
} else { |
if (&Apache::lonnet::allowed('bre',$env{'form.filename'})) { |
unless (($cuname,$cudom)= |
if ($env{'request.course.id'}) { |
&Apache::loncacc::constructaccess($env{'form.filename'}, |
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
$r->dir_config('lonDefDomain'))) { |
$allowed = 1; |
$r->log_reason($cuname.' at '.$cudom. |
} |
' trying to get diffs file '.$env{'form.filename'}. |
} else { |
' - not authorized', |
$allowed = 1; |
$r->filename); |
} |
return HTTP_NOT_ACCEPTABLE; |
} elsif (&Apache::lonnet::allowed('bro',$env{'form.filename'})) { |
} |
$allowed = 1; |
} |
} |
|
if ($allowed) { |
my $efn=$env{'form.filename'}; |
($cudom,$cuname,$env{'form.filename'})= |
|
($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)(/.*)$}); |
|
|
|
if (($env{'form.versionone'} eq 'priv') || ($env{'form.versiontwo'} eq 'priv')) { |
|
my ($cstrname,$cstrdom) = |
|
&Apache::lonnet::constructaccess("/priv/$cudom/$cuname".$env{'form.filename'}); |
|
unless (($cstrname eq $cuname) && ($cstrdom eq $cudom)) { |
|
$allowed = 0; |
|
} |
|
} |
|
} |
|
} else { |
|
($cuname,$cudom)= |
|
&Apache::lonnet::constructaccess($env{'form.filename'}); |
|
if ($cuname ne '' && $cudom ne '') { |
|
$allowed = 1; |
|
} else { |
|
$r->log_reason($env{'user.name'}.':'.$env{'user.domain'}. |
|
' trying to get diffs file '.$env{'form.filename'}. |
|
' - not authorized', |
|
$r->filename); |
|
} |
|
} |
|
unless ($allowed) { |
|
return HTTP_NOT_ACCEPTABLE; |
|
} |
|
|
$efn=~s/\/\~(\w+)//g; |
# Get the files |
|
|
my @f1=(); |
my $efn=$env{'form.filename'}; |
my @f2=(); |
$efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; |
|
|
&Apache::loncommon::content_type($r,'text/html'); |
my @f1=(); |
$r->send_http_header; |
my @f2=(); |
|
|
$r->print(&Apache::loncommon::start_page('Resource Differences')); |
&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>'.($env{'form.filetwo'}?'':&mt('Compare versions of')). |
$r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')). |
' <tt>'.$efn.'</tt></h1>'); |
' <span class="LC_filename">'.$efn.'</span>'); |
|
|
if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { |
if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { |
$r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom. |
my $nameshown = &Apache::loncommon::plainname($cuname,$cudom). |
'</font></h3>'); |
' ('.$cuname.':'.$cudom.')'; |
} |
$r->print('<p><span class="LC_info">'); |
|
if ($env{'request.role'} =~ /^ca\./) { |
|
$r->print(&mt('Co-Author in Construction Space for: [_1]',$nameshown)); |
if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' |
} elsif ($env{'request.role'} =~ /^aa\./) { |
|| $efn =~ /\.meta$/) { |
$r->print(&mt('Assistant Author in Construction Space for: [_1]',$nameshown)); |
$r->print('<p><font color="red">'); |
} else { |
if ($env{'form.versionone'} eq 'priv') { |
$r->print(&mt('Resource Author is: [_1]',$nameshown)); |
my $fn='/home/'.$cuname.'/public_html/'.$efn; |
} |
@f1=&get_split_file($fn,'local'); |
$r->print('</span></p>'); |
$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('</font><br />'.&mt('versus').'<br /><font color="green">'); |
|
|
|
if ($env{'form.filetwo'}) { |
|
my $efn2=$env{'form.filetwo'}; |
|
$efn2=~s/\/\~(\w+)//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('</font></p>'); |
|
# Run diff |
|
|
|
my $diffs = diff(\@f1, \@f2); |
|
|
|
# Start page output |
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=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; |
|
@f1=&get_split_file($fn,'local'); |
|
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
|
} else { |
|
my $fn=$r->dir_config('lonDocRoot')."/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">'); |
|
|
my $chunk; |
if ($env{'form.filetwo'}) { |
my $line; |
my $efn2=$env{'form.filetwo'}; |
|
$efn2=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; |
|
my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn2; |
|
@f2=&get_split_file($fn,'local'); |
|
$r->print('<tt>'.$efn2.'</tt>'); |
|
} elsif ($env{'form.versiontwo'} eq 'priv') { |
|
my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; |
|
@f2=&get_split_file($fn,'local'); |
|
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
|
} else { |
|
my $fn=$r->dir_config('lonDocRoot')."/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 |
|
|
$r->print('<pre>'); |
my $diffs = diff(\@f1, \@f2); |
|
|
foreach $chunk (@$diffs) { |
if (@$diffs) { |
|
# Start page output |
foreach $line (@$chunk) { |
my $chunk; |
my ($sign, $lineno, $text) = @$line; |
my $line; |
$text=~s/\</\<\;/g; |
$r->print('<pre>'); |
$text=~s/\>/\>\;/g; |
foreach $chunk (@$diffs) { |
$lineno=substr($lineno.' ',0,7); |
foreach $line (@$chunk) { |
$r->print('<font color='.(($sign eq '+')?'green':'red').'>'. |
my ($sign, $lineno, $text) = @$line; |
$sign.' '.$lineno.' '.$text."</font>\n"); |
$text=&HTML::Entities::encode($text,'<>&"'); |
} |
$lineno=substr($lineno.' ',0,7); |
$r->print("<hr>\n"); |
$r->print('<span class="'.(($sign eq '+')?'LC_diff_added' |
} |
:'LC_diff_removed').'">'. |
$r->print('</pre>'); |
$sign.' '.$lineno.' '.$text."</span>\n"); |
|
} |
} else { |
$r->print("</pre><hr /><pre>\n"); |
$r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>'); |
} |
} |
$r->print('</pre>'); |
$r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>'); |
} else { |
$r->print(&Apache::loncommon::end_page()); |
$r->print('<p class="LC_info">'.&mt('No differences found').'</p>'); |
return OK; |
} |
|
} else { |
|
$r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>'); |
|
} |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
} |
} |
|
|
|
|
Line 214 sub handler {
|
Line 241 sub handler {
|
__END__ |
__END__ |
|
|
|
|
|
=pod |
|
|
|
=head1 NAME |
|
|
|
Apache::londiff |
|
|
|
=head1 SYNOPSIS |
|
|
|
Handler to show difference between two files. |
|
|
|
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 |