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.24 and 1.30

version 1.24, 2008/11/10 13:20:04	version 1.30, 2011/10/29 19:11:46
Line 27	Line 27
#	#
###	###

=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.

=head2 Subroutines

=cut


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

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

$efn=~s{/\~($LONCAPA::username_re)}{}g;	$efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};

my @f1=();	my @f1=();
my @f2=();	my @f2=();
Line 122 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 138 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=$r->dir_config('lonDocRoot')."/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 {
my $fn=	my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname";
'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
if ($env{'form.versionone'}) {	if ($env{'form.versionone'}) {
my ($main,$suffix,$is_meta)=	my ($main,$suffix,$is_meta)=
&Apache::lonretrieve::get_file_info($efn);	&Apache::lonretrieve::get_file_info($efn);
Line 163 sub handler {	Line 151 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{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
my $fn='/home/'.$cuname.'/public_html/'.$efn2;	my $fn=$r->dir_config('lonDocRoot')."/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=$r->dir_config('lonDocRoot')."/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 191 sub handler {	Line 179 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 226 sub handler {	Line 213 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.24
changed lines
	Added in v.1.30