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.14 and 1.16

version 1.14, 2003/12/10 16:05:43	version 1.16, 2005/04/07 06:56:26
Line 52 use File::Copy;	Line 52 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;	use Apache::loncacc;
use Apache::lonnet();	use Apache::lonnet;
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonlocal;	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 {	sub handler {

my $r=shift;	my $r=shift;
Line 66 sub handler {	Line 93 sub handler {
['filename','versiontwo','versionone']);	['filename','versiontwo','versionone']);
# Get the files	# Get the files

my $cuname=$ENV{'user.name'};	my $cuname=$env{'user.name'};
my $cudom=$ENV{'user.domain'};	my $cudom=$env{'user.domain'};

if ($ENV{'form.filename'}=~/^\/res\//) {	if ($env{'form.filename'}=~/^\/res\//) {
($cudom,$cuname,$ENV{'form.filename'})=	($cudom,$cuname,$env{'form.filename'})=
($ENV{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);	($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);
} else {	} else {
unless (($cuname,$cudom)=	unless (($cuname,$cudom)=
&Apache::loncacc::constructaccess($ENV{'form.filename'},	&Apache::loncacc::constructaccess($env{'form.filename'},
$r->dir_config('lonDefDomain'))) {	$r->dir_config('lonDefDomain'))) {
$r->log_reason($cuname.' at '.$cudom.	$r->log_reason($cuname.' at '.$cudom.
' trying to get diffs file '.$ENV{'form.filename'}.	' trying to get diffs file '.$env{'form.filename'}.
' - not authorized',	' - not authorized',
$r->filename);	$r->filename);
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}
}	}

my $efn=$ENV{'form.filename'};	my $efn=$env{'form.filename'};

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

Line 101 sub handler {	Line 128 sub handler {

$r->print('<h1>'.&mt('Compare versions of').' <tt>'.$efn.'</tt></h1>');	$r->print('<h1>'.&mt('Compare versions of').' <tt>'.$efn.'</tt></h1>');

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.	$r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
'</font></h3>');	'</font></h3>');
}	}
Line 110 sub handler {	Line 137 sub handler {
if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq	if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
'ssi') {	'ssi') {
$r->print('<p><font color="red">');	$r->print('<p><font color="red">');
if ($ENV{'form.versionone'} eq 'priv') {	if ($env{'form.versionone'} eq 'priv') {
my $fn='/home/'.$cuname.'/public_html/'.$efn;	my $fn='/home/'.$cuname.'/public_html/'.$efn;
if (-e $fn) {	@f1=&get_split_file($fn,'local');
my $fh=Apache::File->new($fn);
my $line;
while($line=<$fh>) {
chomp($line);
$f1[$#f1+1]=$line;
}
}
$r->print('<b>'.&mt('Construction Space Version').'</b>');	$r->print('<b>'.&mt('Construction Space Version').'</b>');
} else {	} else {
my $fn=	my $fn=
'/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';	'/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
if ($ENV{'form.versionone'}) {	if ($env{'form.versionone'}) {
my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);	my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
$fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;	$fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix;
$r->print('<b>'.&mt('Version').' '.$ENV{'form.versionone'}.'</b>');	$r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
} else {	} else {
$fn.=$efn;	$fn.=$efn;
$r->print('<b>'.&mt('Current Version').'</b>');	$r->print('<b>'.&mt('Current Version').'</b>');
}	}
@f1=split(/\n/,&Apache::lonnet::getfile($fn));	@f1=&get_split_file($fn,'remote');
}	}

$r->print('</font><br />'.&mt('versus').'<br /><font color="green">');	$r->print('</font><br />'.&mt('versus').'<br /><font color="green">');

if ($ENV{'form.versiontwo'} eq 'priv') {	if ($env{'form.versiontwo'} eq 'priv') {
my $fn='/home/'.$cuname.'/public_html/'.$efn;	my $fn='/home/'.$cuname.'/public_html/'.$efn;
if (-e $fn) {	@f2=&get_split_file($fn,'local');
my $fh=Apache::File->new($fn);
my $line;
while($line=<$fh>) {
chomp($line);
$f2[$#f2+1]=$line;
}
}
$r->print('<b>'.&mt('Construction Space Version').'</b>');	$r->print('<b>'.&mt('Construction Space Version').'</b>');
} else {	} else {
my $fn=	my $fn=
'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';	'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
if ($ENV{'form.versiontwo'}) {	if ($env{'form.versiontwo'}) {
my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);	my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
$fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;	$fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
$r->print('<b>'.&mt('Version').' '.$ENV{'form.versiontwo'}.'</b>');	$r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');
} else {	} else {
$fn.=$efn;	$fn.=$efn;
$r->print('<b>'.&mt('Current Version').'</b>');	$r->print('<b>'.&mt('Current Version').'</b>');
}	}
@f2=split(/\n/,&Apache::lonnet::getfile($fn));	@f2=&get_split_file($fn,'remote');
}	}
$r->print('</font></p>');	$r->print('</font></p>');
# Run diff	# Run diff

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

Removed from v.1.14
changed lines
	Added in v.1.16