loncom/publisher/londiff.pm - diff

Return to londiff.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/londiff.pm between versions 1.2 and 1.5

version 1.2, 2001/05/02 21:35:15	version 1.5, 2001/05/09 17:38:12
Line 15	Line 15
#	#
# 03/31,04/03 Gerd Kortemeyer)	# 03/31,04/03 Gerd Kortemeyer)
#	#
# 05/02/01 Gerd Kortemeyer	# 05/02/01,05/09 Gerd Kortemeyer

package Apache::londiff;	package Apache::londiff;

Line 24 use Apache::File;	Line 24 use Apache::File;
use File::Copy;	use File::Copy;
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;

sub handler {	sub handler {

Line 46 sub handler {	Line 46 sub handler {

# Get the files	# 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'};

	$efn=~s/\/\~(\w+)//g;

my @f1=();	my @f1=();
my @f2=();	my @f2=();

Line 57 sub handler {	Line 74 sub handler {
$r->print('<body bgcolor="#FFFFFF">');	$r->print('<body bgcolor="#FFFFFF">');


$r->print('<h1>Compare versions of <tt>'.$ENV{'form.filename'}.'</tt></h1>');	$r->print('<h1>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::lonnet::fileembstyle(($ENV{'form.filename'}=~/\.(\w+)$/)) eq	if (&Apache::lonnet::fileembstyle(($efn=~/\.(\w+)$/)) eq
'ssi') {	'ssi') {
if ($ENV{'form.versionone'} eq 'priv') {	if ($ENV{'form.versionone'} eq 'priv') {
my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};	my $fn='/home/'.$cuname.'/public_html/'.$efn;
if (-e $fn) {	if (-e $fn) {
my $fh=Apache::File->new($fn);	my $fh=Apache::File->new($fn);
my $line;	my $line;
Line 71 sub handler {	Line 94 sub handler {
$f1[$#f1+1]=$line;	$f1[$#f1+1]=$line;
}	}
}	}
	$r->print('<h3>Construction Space Version</h3>');
} else {	} else {
my $fn=	my $fn=
'/home/httpd/html//res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';	'/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
if ($ENV{'form.versionone'}) {	if ($ENV{'form.versionone'}) {
my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);	my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
$fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;	$fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
	$r->print('<h3>Version '.$ENV{'form.versionone'}.'</h3>');
} else {	} else {
$fn.=$ENV{'form.filename'};	$fn.=$efn;
	$r->print('<h3>Current Version</h3>');
}	}
@f1=split(/\n/,&Apache::lonnet::getfile($fn));	@f1=split(/\n/,&Apache::lonnet::getfile($fn));
}	}

	$r->print('versus');

if ($ENV{'form.versiontwo'} eq 'priv') {	if ($ENV{'form.versiontwo'} eq 'priv') {
my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};	my $fn='/home/'.$cuname.'/public_html/'.$efn;
if (-e $fn) {	if (-e $fn) {
my $fh=Apache::File->new($fn);	my $fh=Apache::File->new($fn);
my $line;	my $line;
Line 94 sub handler {	Line 121 sub handler {
$f2[$#f2+1]=$line;	$f2[$#f2+1]=$line;
}	}
}	}
	$r->print('<h3>Construction Space Version</h3>');
} else {	} else {
my $fn=	my $fn=
'/home/httpd/html/res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';	'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
if ($ENV{'form.versiontwo'}) {	if ($ENV{'form.versiontwo'}) {
my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);	my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
$fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;	$fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
	$r->print('<h3>Version '.$ENV{'form.versiontwo'}.'</h3>');
} else {	} else {
$fn.=$ENV{'form.filename'};	$fn.=$efn;
	$r->print('<h3>Current Version</h3>');
}	}
@f2=split(/\n/,&Apache::lonnet::getfile($fn));	@f2=split(/\n/,&Apache::lonnet::getfile($fn));
}	}
Line 115 sub handler {	Line 145 sub handler {
my $chunk;	my $chunk;
my $line;	my $line;

$r->print('<table border=2><tr><th>Version '.$ENV{'form.versionone'}.	$r->print('<pre>');
'</th><th>Version '.$ENV{'form.versiontwo'}.'</th>');
foreach $chunk (@$diffs) {	foreach $chunk (@$diffs) {
$r->print('</pre></tr><tr><td><pre>');
my $presign='-';
foreach $line (@$chunk) {	foreach $line (@$chunk) {
my ($sign, $lineno, $text) = @$line;	my ($sign, $lineno, $text) = @$line;
if ($sign ne $presign) {
$r->print('</pre></td><td><pre>');
$presign=$sign;
}
$text=~s/\</\&lt\;/g;	$text=~s/\</\&lt\;/g;
$text=~s/\>/\&gt\;/g;	$text=~s/\>/\&gt\;/g;
$lineno=substr($lineno.' ',0,8);	$lineno=substr($lineno.' ',0,7);
$r->print($lineno.' '.$text."\n");	$r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
	$sign.' '.$lineno.' '.$text."</font>\n");
}	}
	$r->print("<hr>\n");
}	}
	$r->print('</pre>');

$r->print('</tr></table>');
} else {	} else {
$r->print('<h1><font color=red>Binary File</font></h1>');	$r->print('<h1><font color=red>Binary File</font></h1>');
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2
changed lines
	Added in v.1.5