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.21 and 1.27

version 1.21, 2006/09/19 21:47:29	version 1.27, 2009/05/14 14:24:18
Line 27	Line 27
#	#
###	###




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

use strict;	use strict;
Line 40 use Apache::lonnet;	Line 43 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 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 88 sub handler {	Line 84 sub handler {

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'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$});
} 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.':'.$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);
Line 103 sub handler {	Line 99 sub handler {

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

$efn=~s/\/\~(\w+)//g;	$efn=~s{/\~($LONCAPA::username_re)}{}g;

my @f1=();	my @f1=();
my @f2=();	my @f2=();
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_warning">'
'</span></h3>');	.&mt('Co-Author [_1]'
	,&Apache::loncommon::plainname($cuname,$cudom)
	.' ('.$cuname.':'.$cudom.')')
	.'</span></p>'
	);
}	}


Line 152 sub handler {	Line 152 sub handler {

if ($env{'form.filetwo'}) {	if ($env{'form.filetwo'}) {
my $efn2=$env{'form.filetwo'};	my $efn2=$env{'form.filetwo'};
$efn2=~s/\/\~(\w+)//g;	$efn2=~s{/\~($LONCAPA::username_re)}{}g;
my $fn='/home/'.$cuname.'/public_html/'.$efn2;	my $fn='/home/'.$cuname.'/public_html/'.$efn2;
@f2=&get_split_file($fn,'local');	@f2=&get_split_file($fn,'local');
$r->print('<tt>'.$efn2.'</tt>');	$r->print('<tt>'.$efn2.'</tt>');
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;	if (@$diffs) {
my $line;	# Start page output
	my $chunk;
$r->print('<pre>');	my $line;
	$r->print('<pre>');
foreach $chunk (@$diffs) {	foreach $chunk (@$diffs) {
	foreach $line (@$chunk) {
foreach $line (@$chunk) {	my ($sign, $lineno, $text) = @$line;
my ($sign, $lineno, $text) = @$line;	$text=&HTML::Entities::encode($text,'<>&"');
$text=&HTML::Entities::encode($text,'<>&"');	$lineno=substr($lineno.' ',0,7);
$lineno=substr($lineno.' ',0,7);	$r->print('<span class="'.(($sign eq '+')?'LC_diff_added'
$r->print('<span class="'.(($sign eq '+')?'LC_diff_added'	:'LC_diff_removed').'">'.
:'LC_diff_removed').'">'.	$sign.' '.$lineno.' '.$text."</span>\n");
$sign.' '.$lineno.' '.$text."</span>\n");	}
}	$r->print("</pre><hr /><pre>\n");
$r->print("</pre><hr /><pre>\n");	}
}	$r->print('</pre>');
$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

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

Removed from v.1.21
changed lines
	Added in v.1.27