version 1.22, 2006/12/05 02:55:55
|
version 1.29, 2011/10/23 23:46:07
|
Line 27
|
Line 27
|
# |
# |
### |
### |
|
|
|
|
|
|
|
|
package Apache::londiff; |
package Apache::londiff; |
|
|
use strict; |
use strict; |
Line 55 sub get_split_file {
|
Line 58 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 111 sub handler {
|
Line 107 sub handler {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
$r->print(&Apache::loncommon::start_page('Resource Differences')); |
$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><span class="LC_diff_coauthor">Co-Author: '.$cuname.' at '.$cudom. |
$r->print('<p><span class="LC_info">' |
'</span></h3>'); |
.&mt('Co-Author [_1]' |
|
,&Apache::loncommon::plainname($cuname,$cudom) |
|
.' ('.$cuname.':'.$cudom.')') |
|
.'</span></p>' |
|
); |
} |
} |
|
|
|
|
Line 127 sub handler {
|
Line 127 sub handler {
|
|| $efn =~ /\.meta$/) { |
|| $efn =~ /\.meta$/) { |
$r->print('<p><span class="LC_diff_removed">'); |
$r->print('<p><span class="LC_diff_removed">'); |
if ($env{'form.versionone'} eq 'priv') { |
if ($env{'form.versionone'} eq 'priv') { |
my $fn='/home/'.$cuname.'/public_html/'.$efn; |
my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn; |
@f1=&get_split_file($fn,'local'); |
@f1=&get_split_file($fn,'local'); |
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
} else { |
} else { |
Line 153 sub handler {
|
Line 153 sub handler {
|
if ($env{'form.filetwo'}) { |
if ($env{'form.filetwo'}) { |
my $efn2=$env{'form.filetwo'}; |
my $efn2=$env{'form.filetwo'}; |
$efn2=~s{/\~($LONCAPA::username_re)}{}g; |
$efn2=~s{/\~($LONCAPA::username_re)}{}g; |
my $fn='/home/'.$cuname.'/public_html/'.$efn2; |
my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn2; |
@f2=&get_split_file($fn,'local'); |
@f2=&get_split_file($fn,'local'); |
$r->print('<tt>'.$efn2.'</tt>'); |
$r->print('<tt>'.$efn2.'</tt>'); |
} elsif ($env{'form.versiontwo'} eq 'priv') { |
} elsif ($env{'form.versiontwo'} eq 'priv') { |
my $fn='/home/'.$cuname.'/public_html/'.$efn; |
my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn; |
@f2=&get_split_file($fn,'local'); |
@f2=&get_split_file($fn,'local'); |
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
} else { |
} else { |
Line 180 sub handler {
|
Line 180 sub handler {
|
# Run diff |
# Run diff |
|
|
my $diffs = diff(\@f1, \@f2); |
my $diffs = diff(\@f1, \@f2); |
|
|
# Start page output |
|
|
|
my $chunk; |
|
my $line; |
|
|
|
$r->print('<pre>'); |
if (@$diffs) { |
|
# Start page output |
foreach $chunk (@$diffs) { |
my $chunk; |
|
my $line; |
foreach $line (@$chunk) { |
$r->print('<pre>'); |
my ($sign, $lineno, $text) = @$line; |
foreach $chunk (@$diffs) { |
$text=&HTML::Entities::encode($text,'<>&"'); |
foreach $line (@$chunk) { |
$lineno=substr($lineno.' ',0,7); |
my ($sign, $lineno, $text) = @$line; |
$r->print('<span class="'.(($sign eq '+')?'LC_diff_added' |
$text=&HTML::Entities::encode($text,'<>&"'); |
:'LC_diff_removed').'">'. |
$lineno=substr($lineno.' ',0,7); |
$sign.' '.$lineno.' '.$text."</span>\n"); |
$r->print('<span class="'.(($sign eq '+')?'LC_diff_added' |
} |
:'LC_diff_removed').'">'. |
$r->print("</pre><hr /><pre>\n"); |
$sign.' '.$lineno.' '.$text."</span>\n"); |
} |
} |
$r->print('</pre>'); |
$r->print("</pre><hr /><pre>\n"); |
|
} |
|
$r->print('</pre>'); |
|
} else { |
|
$r->print('<p class="LC_info">'.&mt('No differences found').'</p>'); |
|
} |
} else { |
} else { |
$r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>'); |
$r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>'); |
} |
} |
Line 215 sub handler {
|
Line 214 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 |