--- loncom/publisher/londiff.pm 2007/01/15 18:34:32 1.23 +++ loncom/publisher/londiff.pm 2011/10/29 19:11:46 1.30 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.23 2007/01/15 18:34:32 albertel Exp $ +# $Id: londiff.pm,v 1.30 2011/10/29 19:11:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,9 @@ # ### + + + package Apache::londiff; use strict; @@ -81,7 +84,7 @@ sub handler { if ($env{'form.filename'}=~/^\/res\//) { ($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 { unless (($cuname,$cudom)= &Apache::loncacc::constructaccess($env{'form.filename'}, @@ -96,7 +99,7 @@ sub handler { my $efn=$env{'form.filename'}; - $efn=~s{/\~($LONCAPA::username_re)}{}g; + $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; my @f1=(); my @f2=(); @@ -104,15 +107,19 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $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('
' + .&mt('Co-Author [_1]' + ,&Apache::loncommon::plainname($cuname,$cudom) + .' ('.$cuname.':'.$cudom.')') + .'
' + ); } @@ -120,12 +127,11 @@ sub handler { || $efn =~ /\.meta$/) { $r->print('');
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');
$r->print(''.&mt('Construction Space Version').'');
} else {
- my $fn=
- '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
+ my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname";
if ($env{'form.versionone'}) {
my ($main,$suffix,$is_meta)=
&Apache::lonretrieve::get_file_info($efn);
@@ -145,12 +151,12 @@ sub handler {
if ($env{'form.filetwo'}) {
my $efn2=$env{'form.filetwo'};
- $efn2=~s{/\~($LONCAPA::username_re)}{}g;
- my $fn='/home/'.$cuname.'/public_html/'.$efn2;
+ $efn2=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
+ my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn2;
@f2=&get_split_file($fn,'local');
$r->print(''.$efn2.'');
} 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');
$r->print(''.&mt('Construction Space Version').'');
} else {
@@ -173,28 +179,27 @@ sub handler {
# Run diff
my $diffs = diff(\@f1, \@f2);
-
-# Start page output
-
- my $chunk;
- my $line;
- $r->print(' '.&mt('No differences found').'');
-
- foreach $chunk (@$diffs) {
-
- foreach $line (@$chunk) {
- my ($sign, $lineno, $text) = @$line;
- $text=&HTML::Entities::encode($text,'<>&"');
- $lineno=substr($lineno.' ',0,7);
- $r->print(''.
- $sign.' '.$lineno.' '.$text."\n");
- }
- $r->print("
\n");
- }
- $r->print('
');
-
+ if (@$diffs) {
+ # Start page output
+ my $chunk;
+ my $line;
+ $r->print('');
+ foreach $chunk (@$diffs) {
+ foreach $line (@$chunk) {
+ my ($sign, $lineno, $text) = @$line;
+ $text=&HTML::Entities::encode($text,'<>&"');
+ $lineno=substr($lineno.' ',0,7);
+ $r->print(''.
+ $sign.' '.$lineno.' '.$text."\n");
+ }
+ $r->print("
\n");
+ }
+ $r->print('
');
+ } else {
+ $r->print(''.&mt('Binary File').'
');
}
@@ -208,5 +213,27 @@ sub handler {
__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