[BACK]Return to londiff.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/londiff.pm between versions 1.3 and 1.19

version 1.3, 2001/05/02 23:00:05 version 1.19, 2006/05/17 13:41:45
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Handler to show differences between file versions  # Handler to show differences between file versions
 #  #
 # (Handler to retrieve an old version of a file  # $Id$
 #  #
 # (Publication Handler  # Copyright Michigan State University Board of Trustees
 #   
 # (TeX Content Handler  
 #  #
 # 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  # LON-CAPA is free software; you can redistribute it and/or modify
 # 03/23 Guy Albertelli  # it under the terms of the GNU General Public License as published by
 # 03/24,03/29 Gerd Kortemeyer)  # 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 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;  package Apache::londiff;
   
 use strict;  use strict;
 use Apache::File;  use Apache::File;
 use File::Copy;  use File::Copy;
   use File::Compare;
 use Algorithm::Diff qw(diff);  use Algorithm::Diff qw(diff);
 use Apache::Constants qw(:common :http :methods);  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 eq '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 are_different_files {
       my ($fileone,$filetwo)=@_;
       return &compare($fileone,$filetwo);
   }
   
 sub handler {  sub handler {
   
Line 32  sub handler { Line 78  sub handler {
   
 # Get query string for limited number of parameters  # Get query string for limited number of parameters
   
     map {     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        my ($name, $value) = split(/=/,$_);     ['filename','versiontwo','versionone','filetwo']);
        $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'}));  
   
 # Get the files  # 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 @f1=();
   my @f2=();    my @f2=();
   
   $r->content_type('text/html');    &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;    $r->send_http_header;
   
   $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');    $r->print(&Apache::loncommon::start_page('Resource Differences'));
   
   $r->print('<body bgcolor="#FFFFFF">');  
   
       
   $r->print('<h1>Compare versions of <tt>'.$ENV{'form.filename'}.'</tt></h1>');    $r->print('<h1>'.($env{'form.filetwo'}?'':&mt('Compare versions of')).
       ' <tt>'.$efn.'</tt></h1>');
  if (&Apache::lonnet::fileembstyle(($ENV{'form.filename'}=~/\.(\w+)$/)) eq     
       'ssi') {         if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
   if ($ENV{'form.versionone'} eq 'priv') {            $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
       my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};                 '</font></h3>');
       if (-e $fn) {  
   my $fh=Apache::File->new($fn);  
           my $line;  
           while($line=<$fh>) {  
              chomp($line);  
              $f1[$#f1+1]=$line;  
  }  
       }  
   } 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;  
       } else {  
          $fn.=$ENV{'form.filename'};  
       }        }
       @f1=split(/\n/,&Apache::lonnet::getfile($fn));        
   }  
   
   
   if ($ENV{'form.versiontwo'} eq 'priv') {   if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi') {
       my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};       $r->print('<p><font color="red">');
       if (-e $fn) {       if ($env{'form.versionone'} eq 'priv') {
   my $fh=Apache::File->new($fn);   my $fn='/home/'.$cuname.'/public_html/'.$efn;
           my $line;   @f1=&get_split_file($fn,'local');
           while($line=<$fh>) {   $r->print('<b>'.&mt('Construction Space Version').'</b>');
              chomp($line);       } else {
              $f2[$#f2+1]=$line;   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('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
    } else {
        $fn.=$efn;
        $r->print('<b>'.&mt('Current Version').'</b>');
  }   }
       }   @f1=&get_split_file($fn,'remote');
   } 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;  
       } else {  
          $fn.=$ENV{'form.filename'};  
       }  
       @f2=split(/\n/,&Apache::lonnet::getfile($fn));        
   }  
   
        $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');
   
        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('<tt>'.$efn2.'</tt>');
        } elsif ($env{'form.versiontwo'} eq 'priv') {
    my $fn='/home/'.$cuname.'/public_html/'.$efn;
    @f2=&get_split_file($fn,'local');
    $r->print('<b>'.&mt('Construction Space Version').'</b>');
        } 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('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');
    } else {
        $fn.=$efn;
        $r->print('<b>'.&mt('Current Version').'</b>');
    }
    @f2=&get_split_file($fn,'remote');
        }
        $r->print('</font></p>');
 # Run diff  # Run diff
   
   my $diffs = diff(\@f1, \@f2);       my $diffs = diff(\@f1, \@f2);
   
 # Start page output  # Start page output
   
   my $chunk;       my $chunk;
   my $line;       my $line;
   
   $r->print('<pre>');  
   
   foreach $chunk (@$diffs) {  
   
     foreach $line (@$chunk) {       $r->print('<pre>');
       my ($sign, $lineno, $text) = @$line;  
       $text=~s/\</\&lt\;/g;  
       $text=~s/\>/\&gt\;/g;  
       $lineno=substr($lineno.'        ',0,7);  
       $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.  
                 $sign.' '.$lineno.' '.$text."</font>\n");  
     }  
     $r->print("<hr>\n");  
   }  
   $r->print('</pre>');  
   
 } else {       foreach $chunk (@$diffs) {
     $r->print('<h1><font color=red>Binary File</font></h1>');    
 }   foreach $line (@$chunk) {
   $r->print('</body></html>');       my ($sign, $lineno, $text) = @$line;
        $text=~s/\</\&lt\;/g;
        $text=~s/\>/\&gt\;/g;
        $lineno=substr($lineno.'        ',0,7);
        $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
          $sign.' '.$lineno.' '.$text."</font>\n");
    }
    $r->print("<hr>\n");
        }
        $r->print('</pre>');
        
    } else {
        $r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>');
    }
     $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
     $r->print(&Apache::loncommon::end_page()); 
   return OK;      return OK;  
 }  }
   
Removed from v.1.3  
changed lines
  Added in v.1.19

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