--- loncom/publisher/londiff.pm 2001/05/02 21:01:47 1.1 +++ loncom/publisher/londiff.pm 2005/04/07 06:56:26 1.16 @@ -1,6 +1,31 @@ # 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 $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# +# # (Handler to retrieve an old version of a file # # (Publication Handler @@ -15,7 +40,9 @@ # # 03/31,04/03 Gerd Kortemeyer) # -# 05/02/01 Gerd Kortemeyer +# 05/02/01,05/09 Gerd Kortemeyer +# +### package Apache::londiff; @@ -24,7 +51,37 @@ use Apache::File; use File::Copy; use Algorithm::Diff qw(diff); use Apache::Constants qw(:common :http :methods); - +use Apache::loncacc; +use Apache::lonnet; +use Apache::loncommon(); +use Apache::lonlocal; + + +sub get_split_file { + my ($fn,$style)=@_; + my $f1; + my @f1; + if ($style='local') { + if (-e $fn) { + my $fh=Apache::File->new($fn); + my $line; + while($line=<$fh>) { + $f1.=$line; + } + } + } elsif ($style eq 'remote') { + my $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)); + } + return @f1; +} sub handler { @@ -32,108 +89,121 @@ sub handler { # Get query string for limited number of parameters - map { - my ($name, $value) = split(/=/,$_); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - if (($name eq 'filename') || ($name eq 'versiontwo') || - ($name eq 'versionone')) { - unless ($ENV{'form.'.$name}) { - $ENV{'form.'.$name}=$value; - } - } - } (split(/&/,$ENV{'QUERY_STRING'})); - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['filename','versiontwo','versionone']); # Get the files + 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+)\/(.*)$/); + } 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=(); - if ($ENV{'form.versionone'} eq 'priv') { - my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'}; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f1[$#f1+1]=$line; - } + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + $r->print('LON-CAPA Construction Diffs'); + + $r->print(&Apache::loncommon::bodytag('Resource Differences')); + + + $r->print('

'.&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/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/'; - if ($ENV{'form.versionone'}) { - my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/); - $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix; + '/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.=$ENV{'form.filename'}; + $fn.=$efn; + $r->print(''.&mt('Current Version').''); } - @f1=split(/\n/,&Apache::lonnet::getfile($fn)); + @f1=&get_split_file($fn,'remote'); } + $r->print('
'.&mt('versus').'
'); - if ($ENV{'form.versiontwo'} eq 'priv') { - my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'}; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f2[$#f2+1]=$line; - } - } + 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/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/'; - if ($ENV{'form.versiontwo'}) { - my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/); - $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix; + '/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.=$ENV{'form.filename'}; + $fn.=$efn; + $r->print(''.&mt('Current Version').''); } - @f2=split(/\n/,&Apache::lonnet::getfile($fn)); + @f2=&get_split_file($fn,'remote'); } - + $r->print('

'); # Run diff my $diffs = diff(\@f1, \@f2); # Start page output - $r->content_type('text/html'); - $r->send_http_header; - - $r->print('LON-CAPA Construction Diffs'); - - $r->print(''); - - - $r->print('

Compare versions of '.$ENV{'form.filename'}.'

'); - my $chunk; my $line; - $r->print(''); + $r->print('
');
+
   foreach $chunk (@$diffs) {
-    $r->print('
Version '.$ENV{'form.versionone'}. - 'Version '.$ENV{'form.versiontwo'}.'
');
-    my $presign='-';  
+
     foreach $line (@$chunk) {
       my ($sign, $lineno, $text) = @$line;
-      if ($sign ne $presign) {
-	  $r->print('
');
-          $presign=$sign;
-      }
       $text=~s/\/\>\;/g;
-      $lineno=substr($lineno.'        ',0,8);
-      $r->print($lineno.' '.$text."\n");
+      $lineno=substr($lineno.'        ',0,7);
+      $r->print(''.
+                $sign.' '.$lineno.' '.$text."\n");
     }
+    $r->print("
\n");
   }
+  $r->print('
'); - $r->print('
'); - - $r->print(''); +} else { + $r->print('

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

'); +} + $r->print('
'.&mt('Close This Window').'
'); return OK; } @@ -143,3 +213,4 @@ __END__ +