--- loncom/publisher/londiff.pm 2005/04/07 06:56:26 1.16 +++ loncom/publisher/londiff.pm 2006/12/05 02:55:55 1.22 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.16 2005/04/07 06:56:26 albertel Exp $ +# $Id: londiff.pm,v 1.22 2006/12/05 02:55:55 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,19 +32,21 @@ 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::loncacc(); use Apache::lonnet; use Apache::loncommon(); +use Apache::lonretrieve(); use Apache::lonlocal; - +use LONCAPA(); 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,128 +68,146 @@ sub get_split_file { return @f1; } -sub handler { +sub are_different_files { + my ($fileone,$filetwo)=@_; + return &compare($fileone,$filetwo); +} - my $r=shift; +sub handler { + my $r=shift; # Get query string for limited number of parameters - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['filename','versiontwo','versionone']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['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'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$}); + } else { + unless (($cuname,$cudom)= + &Apache::loncacc::constructaccess($env{'form.filename'}, + $r->dir_config('lonDefDomain'))) { + $r->log_reason($cuname.':'.$cudom. + ' trying to get diffs file '.$env{'form.filename'}. + ' - not authorized', + $r->filename); + return HTTP_NOT_ACCEPTABLE; + } + } + + my $efn=$env{'form.filename'}; - 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; - } - } - - my $efn=$env{'form.filename'}; - - $efn=~s/\/\~(\w+)//g; - - my @f1=(); - my @f2=(); + $efn=~s{/\~($LONCAPA::username_re)}{}g; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; + my @f1=(); + my @f2=(); - $r->print('LON-CAPA Construction Diffs'); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; - $r->print(&Apache::loncommon::bodytag('Resource Differences')); + $r->print(&Apache::loncommon::start_page('Resource Differences')); - $r->print('

'.&mt('Compare versions of').' '.$efn.'

'); + $r->print('

'.($env{'form.filetwo'}?'':&mt('Compare versions of')). + ' '.$efn.'

'); - if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { - $r->print('

Co-Author: '.$cuname.' at '.$cudom. - '

'); - } - - - if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq - 'ssi') { - $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('

'); -# Run diff + if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { + $r->print('

Co-Author: '.$cuname.' at '.$cudom. + '

'); + } - my $diffs = diff(\@f1, \@f2); -# Start page output + if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' + || $efn =~ /\.meta$/) { + $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').'
'); - my $chunk; - my $line; + if ($env{'form.filetwo'}) { + my $efn2=$env{'form.filetwo'}; + $efn2=~s{/\~($LONCAPA::username_re)}{}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('

'); +# Run diff - $r->print('
');
+	my $diffs = diff(\@f1, \@f2);
+	
+# Start page output
 
-  foreach $chunk (@$diffs) {
+	my $chunk;
+	my $line;
 
-    foreach $line (@$chunk) {
-      my ($sign, $lineno, $text) = @$line;
-      $text=~s/\/\>\;/g;
-      $lineno=substr($lineno.'        ',0,7);
-      $r->print(''.
-                $sign.' '.$lineno.' '.$text."\n");
+	$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').'
');
     }
-    $r->print("
\n");
-  }
-  $r->print('
'); - -} else { - $r->print('

'.&mt('Binary File').'

'); -} - $r->print('
'.&mt('Close This Window').'
'); - return OK; + $r->print('
'.&mt('Close This Window').'
'); + $r->print(&Apache::loncommon::end_page()); + return OK; }