Annotation of loncom/publisher/londiff.pm, revision 1.27

1.1       www         1: # The LearningOnline Network with CAPA
                      2: # Handler to show differences between file versions
                      3: #
1.27    ! bisitz      4: # $Id: londiff.pm,v 1.26 2009/05/14 12:02:14 bisitz Exp $
1.6       albertel    5: #
                      6: # Copyright Michigan State University Board of Trustees
                      7: #
                      8: # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
                      9: #
                     10: # LON-CAPA is free software; you can redistribute it and/or modify
                     11: # it under the terms of the GNU General Public License as published by
                     12: # the Free Software Foundation; either version 2 of the License, or
                     13: # (at your option) any later version.
                     14: #
                     15: # LON-CAPA is distributed in the hope that it will be useful,
                     16: # but WITHOUT ANY WARRANTY; without even the implied warranty of
                     17: # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
                     18: # GNU General Public License for more details.
                     19: #
                     20: # You should have received a copy of the GNU General Public License
                     21: # along with LON-CAPA; if not, write to the Free Software
                     22: # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
                     23: #
                     24: # /home/httpd/html/adm/gpl.txt
                     25: #
                     26: # http://www.lon-capa.org/
                     27: #
1.7       harris41   28: ###
1.1       www        29: 
1.24      jms        30: 
                     31: 
                     32: 
1.1       www        33: package Apache::londiff;
                     34: 
                     35: use strict;
                     36: use Apache::File;
                     37: use File::Copy;
1.19      www        38: use File::Compare;
1.1       www        39: use Algorithm::Diff qw(diff);
                     40: use Apache::Constants qw(:common :http :methods);
1.20      albertel   41: use Apache::loncacc();
1.16      albertel   42: use Apache::lonnet;
1.7       harris41   43: use Apache::loncommon();
1.20      albertel   44: use Apache::lonretrieve();
1.13      sakharuk   45: use Apache::lonlocal;
1.22      albertel   46: use LONCAPA();
1.15      albertel   47: 
                     48: sub get_split_file {
                     49:     my ($fn,$style)=@_;
                     50:     my $f1;
                     51:     my @f1;
1.19      www        52:     if ($style eq 'local') {
1.15      albertel   53: 	if (-e $fn) {
                     54: 	    my $fh=Apache::File->new($fn);
                     55: 	    my $line;	
                     56: 	    while($line=<$fh>) {
                     57: 		$f1.=$line;
                     58: 	    }
                     59: 	}
                     60:     } elsif ($style eq 'remote') {
1.23      albertel   61: 	$f1=&Apache::lonnet::getfile($fn);
1.15      albertel   62:     }
1.23      albertel   63:     @f1=split(/\r\n|\r|\n/,$f1);
1.15      albertel   64:     return @f1;
                     65: }
                     66: 
1.19      www        67: sub are_different_files {
                     68:     my ($fileone,$filetwo)=@_;
                     69:     return &compare($fileone,$filetwo);
                     70: }
                     71: 
1.1       www        72: sub handler {
                     73: 
1.21      albertel   74:     my $r=shift;
1.1       www        75: # Get query string for limited number of parameters
                     76: 
1.21      albertel   77:     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                     78: 					    ['filename','versiontwo',
                     79: 					     'versionone','filetwo']);
1.1       www        80: # Get the files
                     81: 
1.21      albertel   82:     my $cuname=$env{'user.name'};
                     83:     my $cudom=$env{'user.domain'};
1.5       www        84: 
1.21      albertel   85:     if ($env{'form.filename'}=~/^\/res\//) {
                     86: 	($cudom,$cuname,$env{'form.filename'})=
1.22      albertel   87: 	    ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$});
1.21      albertel   88:     } else {
                     89: 	unless (($cuname,$cudom)=
                     90: 		&Apache::loncacc::constructaccess($env{'form.filename'},
                     91: 						  $r->dir_config('lonDefDomain'))) {
1.22      albertel   92: 	    $r->log_reason($cuname.':'.$cudom.
1.21      albertel   93: 			   ' trying to get diffs file '.$env{'form.filename'}.
                     94: 			   '  - not authorized', 
                     95: 			   $r->filename); 
                     96: 	    return HTTP_NOT_ACCEPTABLE;
                     97: 	}
                     98:     }
1.17      www        99:   
1.21      albertel  100:     my $efn=$env{'form.filename'};
1.5       www       101: 
1.22      albertel  102:     $efn=~s{/\~($LONCAPA::username_re)}{}g;
1.5       www       103: 
1.21      albertel  104:     my @f1=();
                    105:     my @f2=();
1.1       www       106: 
1.21      albertel  107:     &Apache::loncommon::content_type($r,'text/html');
                    108:     $r->send_http_header;
1.2       www       109: 
1.26      bisitz    110:     $r->print(&Apache::loncommon::start_page('Resource Differences',undef,
                    111:                                              {'no_nav_bar'  => 1, }));
1.2       www       112:   
1.26      bisitz    113:     $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')).
                    114: 	      ' <span class="LC_filename">'.$efn.'</span>');
1.5       www       115:    
1.21      albertel  116:     if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
1.26      bisitz    117:         $r->print('<p><span class="LC_warning">'
1.27    ! bisitz    118:                  .&mt('Co-Author [_1]'
1.26      bisitz    119:                      ,&Apache::loncommon::plainname($cuname,$cudom)
                    120:                      .' ('.$cuname.':'.$cudom.')')
                    121:                 .'</span></p>'
                    122:         );
1.21      albertel  123:     }
                    124: 
                    125: 
                    126:     if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi'
                    127: 	|| $efn =~ /\.meta$/) {
                    128: 	$r->print('<p><span class="LC_diff_removed">');
                    129: 	if ($env{'form.versionone'} eq 'priv') {
                    130: 	    my $fn='/home/'.$cuname.'/public_html/'.$efn;
                    131: 	    @f1=&get_split_file($fn,'local');
                    132: 	    $r->print('<b>'.&mt('Construction Space Version').'</b>');
                    133: 	} else {
                    134: 	    my $fn=
                    135: 		'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
                    136: 	    if ($env{'form.versionone'}) {
                    137: 		my ($main,$suffix,$is_meta)=
                    138: 		    &Apache::lonretrieve::get_file_info($efn);
                    139: 		
                    140: 		$fn.=($efn =~m|(.*/)[^/]+|)[0];
                    141: 		# add on to $fn the path information in $efn
                    142: 		$fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix;
                    143: 		$r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
                    144: 	    } else {
                    145: 		$fn.=$efn;
                    146: 		$r->print('<b>'.&mt('Current Version').'</b>');
                    147: 	    }
                    148: 	    @f1=&get_split_file($fn,'remote');
                    149: 	}
                    150: 	
                    151: 	$r->print('</span><br />'.&mt('versus').'<br /><span class="LC_diff_added">');
                    152: 
                    153: 	if ($env{'form.filetwo'}) {
                    154: 	    my $efn2=$env{'form.filetwo'};
1.22      albertel  155: 	    $efn2=~s{/\~($LONCAPA::username_re)}{}g;
1.21      albertel  156: 	    my $fn='/home/'.$cuname.'/public_html/'.$efn2;
                    157: 	    @f2=&get_split_file($fn,'local');
                    158: 	    $r->print('<tt>'.$efn2.'</tt>');
                    159: 	} elsif ($env{'form.versiontwo'} eq 'priv') {
                    160: 	    my $fn='/home/'.$cuname.'/public_html/'.$efn;
                    161: 	    @f2=&get_split_file($fn,'local');
                    162: 	    $r->print('<b>'.&mt('Construction Space Version').'</b>');
                    163: 	} else {
                    164: 	    my $fn=
                    165: 		'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
                    166: 	    if ($env{'form.versiontwo'}) {
                    167: 		my ($main,$suffix,$is_meta)=
                    168: 		    &Apache::lonretrieve::get_file_info($efn);
                    169: 		# add on to $fn the path information in $efn
                    170: 		$fn.=($efn =~m|(.*/)[^/]+|)[0];
                    171: 		$fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
                    172: 		$r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');
                    173: 	    } else {
                    174: 		$fn.=$efn;
                    175: 		$r->print('<b>'.&mt('Current Version').'</b>');
                    176: 	    }
                    177: 	    @f2=&get_split_file($fn,'remote');
                    178: 	}
                    179: 	$r->print('</span></p>');
1.1       www       180: # Run diff
                    181: 
1.21      albertel  182: 	my $diffs = diff(\@f1, \@f2);
1.1       www       183: 
1.26      bisitz    184:         if (@$diffs) {
                    185:             # Start page output
                    186:             my $chunk;
                    187:             my $line;
                    188:             $r->print('<pre>');
                    189:             foreach $chunk (@$diffs) {
                    190:                 foreach $line (@$chunk) {
                    191:                     my ($sign, $lineno, $text) = @$line;
                    192:                     $text=&HTML::Entities::encode($text,'<>&"');
                    193:                     $lineno=substr($lineno.'        ',0,7);
                    194:                     $r->print('<span class="'.(($sign eq '+')?'LC_diff_added'
                    195:                                                              :'LC_diff_removed').'">'.
                    196:                               $sign.' '.$lineno.' '.$text."</span>\n");
                    197:                 }
                    198:                 $r->print("</pre><hr /><pre>\n");
                    199:             }
                    200:             $r->print('</pre>');
                    201:         } else {
                    202:             $r->print('<p class="LC_info">'.&mt('No differences found').'</p>');
                    203:         }
1.21      albertel  204:     } else {
                    205: 	$r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>');
                    206:     }
                    207:     $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
                    208:     $r->print(&Apache::loncommon::end_page()); 
                    209:     return OK;  
1.1       www       210: }
                    211: 
                    212: 
                    213: 1;
                    214: __END__
1.2       www       215: 
1.1       www       216: 
1.25      jms       217: =pod
1.1       www       218: 
1.25      jms       219: =head1 NAME
1.1       www       220: 
1.25      jms       221: Apache::londiff
                    222: 
                    223: =head1 SYNOPSIS
                    224: 
                    225: Handler to show difference between two files.
                    226: 
                    227: This is part of the LearningOnline Network with CAPA project
                    228: described at http://www.lon-capa.org.
                    229: 
                    230: =head1 Subroutines
                    231: 
                    232: =over
                    233: 
                    234: =item get_split_file()
                    235: 
                    236: =item are_different_files()
                    237: 
                    238: =item handler()
                    239: 
                    240: =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>