File:
[LON-CAPA] /
loncom /
publisher /
londiff.pm
Revision
1.15:
download - view:
text,
annotated -
select for diffs
Thu Mar 11 22:44:01 2004 UTC (20 years, 1 month ago) by
albertel
Branches:
MAIN
CVS tags:
version_1_3_X,
version_1_3_3,
version_1_3_2,
version_1_3_1,
version_1_3_0,
version_1_2_X,
version_1_2_99_1,
version_1_2_99_0,
version_1_2_1,
version_1_2_0,
version_1_1_99_5,
version_1_1_99_4,
version_1_1_99_3,
version_1_1_99_2,
version_1_1_99_1,
version_1_1_99_0,
HEAD
- Fixes BUG#2602, line ending changes made diff useless.
# The LearningOnline Network with CAPA
# Handler to show differences between file versions
#
# $Id: londiff.pm,v 1.15 2004/03/11 22:44:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#
# LON-CAPA is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# LON-CAPA is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LON-CAPA; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
#
# 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
#
###
package Apache::londiff;
use strict;
use Apache::File;
use File::Copy;
use Algorithm::Diff qw(diff);
use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;
use Apache::lonnet();
use Apache::loncommon();
use Apache::lonlocal;
sub get_split_file {
my ($fn,$style)=@_;
my $f1;
my @f1;
if ($style='local') {
if (-e $fn) {
my $fh=Apache::File->new($fn);
my $line;
while($line=<$fh>) {
$f1.=$line;
}
}
} elsif ($style eq 'remote') {
my $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));
}
return @f1;
}
sub handler {
my $r=shift;
# Get query string for limited number of parameters
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['filename','versiontwo','versionone']);
# Get the files
my $cuname=$ENV{'user.name'};
my $cudom=$ENV{'user.domain'};
if ($ENV{'form.filename'}=~/^\/res\//) {
($cudom,$cuname,$ENV{'form.filename'})=
($ENV{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);
} else {
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'};
$efn=~s/\/\~(\w+)//g;
my @f1=();
my @f2=();
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
$r->print(&Apache::loncommon::bodytag('Resource Differences'));
$r->print('<h1>'.&mt('Compare versions of').' <tt>'.$efn.'</tt></h1>');
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') {
$r->print('<p><font color="red">');
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)=($efn=~/^(.+)\.(\w+)$/);
$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.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)=($efn=~/^(.+)\.(\w+)$/);
$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
my $chunk;
my $line;
$r->print('<pre>');
foreach $chunk (@$diffs) {
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>');
} else {
$r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>');
}
$r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center></body></html>');
return OK;
}
1;
__END__
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/back.gif){kind=icon}
Return to londiff.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / publisher