--- loncom/publisher/londiff.pm 2001/05/09 17:38:12 1.5 +++ loncom/publisher/londiff.pm 2011/10/29 19:11:46 1.30 @@ -1,177 +1,239 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# (Handler to retrieve an old version of a file +# $Id: londiff.pm,v 1.30 2011/10/29 19:11:46 raeburn Exp $ # -# (Publication Handler -# -# (TeX Content Handler +# Copyright Michigan State University Board of Trustees # -# 05/29/00,05/30,10/11 Gerd Kortemeyer) +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). # -# 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) +# 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. # -# 03/31,04/03 Gerd Kortemeyer) +# 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. # -# 05/02/01,05/09 Gerd Kortemeyer +# 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/ +# +### + + + 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 eq 'local') { + if (-e $fn) { + my $fh=Apache::File->new($fn); + my $line; + while($line=<$fh>) { + $f1.=$line; + } + } + } elsif ($style eq 'remote') { + $f1=&Apache::lonnet::getfile($fn); + } + @f1=split(/\r\n|\r|\n/,$f1); + 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 - 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','filetwo']); # Get the files - my $cuname=$ENV{'user.name'}; - my $cudom=$ENV{'user.domain'}; + my $cuname=$env{'user.name'}; + my $cudom=$env{'user.domain'}; - 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.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'}; - $r->content_type('text/html'); - $r->send_http_header; + $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; - $r->print('LON-CAPA Construction Diffs'); + my @f1=(); + my @f2=(); - $r->print(''); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::loncommon::start_page('Resource Differences',undef, + {'no_nav_bar' => 1, })); - $r->print('

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::lonnet::fileembstyle(($efn=~/\.(\w+)$/)) eq - 'ssi') { - if ($ENV{'form.versionone'} eq 'priv') { - my $fn='/home/'.$cuname.'/public_html/'.$efn; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f1[$#f1+1]=$line; - } - } - $r->print('

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('

Version '.$ENV{'form.versionone'}.'

'); - } else { - $fn.=$efn; - $r->print('

Current Version

'); - } - @f1=split(/\n/,&Apache::lonnet::getfile($fn)); - } - - $r->print('versus'); - - if ($ENV{'form.versiontwo'} eq 'priv') { - my $fn='/home/'.$cuname.'/public_html/'.$efn; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f2[$#f2+1]=$line; - } - } - $r->print('

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('

Version '.$ENV{'form.versiontwo'}.'

'); - } else { - $fn.=$efn; - $r->print('

Current Version

'); - } - @f2=split(/\n/,&Apache::lonnet::getfile($fn)); - } + if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { + $r->print('

' + .&mt('Co-Author [_1]' + ,&Apache::loncommon::plainname($cuname,$cudom) + .' ('.$cuname.':'.$cudom.')') + .'

' + ); + } + + if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' + || $efn =~ /\.meta$/) { + $r->print('

'); + if ($env{'form.versionone'} eq 'priv') { + 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=$r->dir_config('lonDocRoot')."/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{^/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=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$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 - my $diffs = diff(\@f1, \@f2); + my $diffs = diff(\@f1, \@f2); -# Start page output + 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('No differences found').'

'); + } + } else { + $r->print('

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

'); + } + $r->print('
'.&mt('Close This Window').'
'); + $r->print(&Apache::loncommon::end_page()); + return OK; +} - my $chunk; - my $line; - $r->print('
');
+1;
+__END__
 
-  foreach $chunk (@$diffs) {
 
-    foreach $line (@$chunk) {
-      my ($sign, $lineno, $text) = @$line;
-      $text=~s/\/\>\;/g;
-      $lineno=substr($lineno.'        ',0,7);
-      $r->print(''.
-                $sign.' '.$lineno.' '.$text."\n");
-    }
-    $r->print("
\n"); - } - $r->print('
'); +=pod -} else { - $r->print('

Binary File

'); -} - $r->print(''); - return OK; -} +=head1 NAME +Apache::londiff -1; -__END__ +=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