--- loncom/publisher/londiff.pm 2004/03/11 22:44:01 1.15 +++ loncom/publisher/londiff.pm 2006/09/13 21:43:26 1.20 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.15 2004/03/11 22:44:01 albertel Exp $ +# $Id: londiff.pm,v 1.20 2006/09/13 21:43:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,23 +25,6 @@ # # http://www.lon-capa.org/ # -# -# (Handler to retrieve an old version of a file -# -# (Publication Handler -# -# (TeX Content Handler -# -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer -# 03/23 Guy Albertelli -# 03/24,03/29 Gerd Kortemeyer) -# -# 03/31,04/03 Gerd Kortemeyer) -# -# 05/02/01,05/09 Gerd Kortemeyer -# ### package Apache::londiff; @@ -49,11 +32,13 @@ package Apache::londiff; use strict; use Apache::File; use File::Copy; +use File::Compare; use Algorithm::Diff qw(diff); use Apache::Constants qw(:common :http :methods); -use Apache::loncacc; -use Apache::lonnet(); +use Apache::loncacc(); +use Apache::lonnet; use Apache::loncommon(); +use Apache::lonretrieve(); use Apache::lonlocal; @@ -61,7 +46,7 @@ sub get_split_file { my ($fn,$style)=@_; my $f1; my @f1; - if ($style='local') { + if ($style eq 'local') { if (-e $fn) { my $fh=Apache::File->new($fn); my $line; @@ -83,35 +68,39 @@ sub get_split_file { return @f1; } +sub are_different_files { + my ($fileone,$filetwo)=@_; + return &compare($fileone,$filetwo); +} + sub handler { my $r=shift; - # Get query string for limited number of parameters &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['filename','versiontwo','versionone']); + ['filename','versiontwo','versionone','filetwo']); # Get the files - my $cuname=$ENV{'user.name'}; - my $cudom=$ENV{'user.domain'}; + my $cuname=$env{'user.name'}; + my $cudom=$env{'user.domain'}; - if ($ENV{'form.filename'}=~/^\/res\//) { - ($cudom,$cuname,$ENV{'form.filename'})= - ($ENV{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/); + if ($env{'form.filename'}=~/^\/res\//) { + ($cudom,$cuname,$env{'form.filename'})= + ($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/); } else { - 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; - } + 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'}; + + my $efn=$env{'form.filename'}; $efn=~s/\/\~(\w+)//g; @@ -121,89 +110,102 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('
');
- if ($ENV{'form.versionone'} eq 'priv') {
- my $fn='/home/'.$cuname.'/public_html/'.$efn;
- @f1=&get_split_file($fn,'local');
- $r->print(''.&mt('Construction Space Version').'');
- } else {
- my $fn=
- '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
- if ($ENV{'form.versionone'}) {
- my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
- $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
- $r->print(''.&mt('Version').' '.$ENV{'form.versionone'}.'');
- } else {
- $fn.=$efn;
- $r->print(''.&mt('Current Version').'');
- }
- @f1=&get_split_file($fn,'remote');
- }
-
- $r->print('
'.&mt('versus').'
');
-
- if ($ENV{'form.versiontwo'} eq 'priv') {
- my $fn='/home/'.$cuname.'/public_html/'.$efn;
- @f2=&get_split_file($fn,'local');
- $r->print(''.&mt('Construction Space Version').'');
- } else {
- my $fn=
- '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
- if ($ENV{'form.versiontwo'}) {
- my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
- $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
- $r->print(''.&mt('Version').' '.$ENV{'form.versiontwo'}.'');
- } else {
- $fn.=$efn;
- $r->print(''.&mt('Current Version').'');
- }
- @f2=&get_split_file($fn,'remote');
- }
- $r->print('
');
+ if ($env{'form.versionone'} eq 'priv') {
+ my $fn='/home/'.$cuname.'/public_html/'.$efn;
+ @f1=&get_split_file($fn,'local');
+ $r->print(''.&mt('Construction Space Version').'');
+ } else {
+ my $fn=
+ '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
+ if ($env{'form.versionone'}) {
+ my ($main,$suffix,$is_meta)=
+ &Apache::lonretrieve::get_file_info($efn);
+
+ $fn.=($efn =~m|(.*/)[^/]+|)[0];
+ # add on to $fn the path information in $efn
+ $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix;
+ $r->print(''.&mt('Version').' '.$env{'form.versionone'}.'');
+ } else {
+ $fn.=$efn;
+ $r->print(''.&mt('Current Version').'');
+ }
+ @f1=&get_split_file($fn,'remote');
+ }
+
+ $r->print('
'.&mt('versus').'
');
+
+ if ($env{'form.filetwo'}) {
+ my $efn2=$env{'form.filetwo'};
+ $efn2=~s/\/\~(\w+)//g;
+ my $fn='/home/'.$cuname.'/public_html/'.$efn2;
+ @f2=&get_split_file($fn,'local');
+ $r->print(''.$efn2.'');
+ } elsif ($env{'form.versiontwo'} eq 'priv') {
+ my $fn='/home/'.$cuname.'/public_html/'.$efn;
+ @f2=&get_split_file($fn,'local');
+ $r->print(''.&mt('Construction Space Version').'');
+ } else {
+ my $fn=
+ '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
+ if ($env{'form.versiontwo'}) {
+ my ($main,$suffix,$is_meta)=
+ &Apache::lonretrieve::get_file_info($efn);
+ # add on to $fn the path information in $efn
+ $fn.=($efn =~m|(.*/)[^/]+|)[0];
+ $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
+ $r->print(''.&mt('Version').' '.$env{'form.versiontwo'}.'');
+ } else {
+ $fn.=$efn;
+ $r->print(''.&mt('Current Version').'');
+ }
+ @f2=&get_split_file($fn,'remote');
+ }
+ $r->print('
'); - - foreach $chunk (@$diffs) { + my $chunk; + my $line; - foreach $line (@$chunk) { - my ($sign, $lineno, $text) = @$line; - $text=~s/\\<\;/g; - $text=~s/\>/\>\;/g; - $lineno=substr($lineno.' ',0,7); - $r->print(''. - $sign.' '.$lineno.' '.$text."\n"); - } - $r->print("'); + $r->print('
\n"); - } - $r->print('
'); -} else { - $r->print(''.&mt('Binary File').'
'); -} - $r->print(''.&mt('Close This Window').'