[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.21

version 1.3, 2001/05/02 23:00:05 version 1.21, 2006/09/19 21:47:29
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::lonretrieve();
   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 {
   
   my $r=shift;      my $r=shift;
   
 # 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',
        $value =~ tr/+/ /;       'versionone','filetwo']);
        $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 @f1=();      my $cuname=$env{'user.name'};
   my @f2=();      my $cudom=$env{'user.domain'};
   
   $r->content_type('text/html');      if ($env{'form.filename'}=~/^\/res\//) {
   $r->send_http_header;   ($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=();
   
   $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');      &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
   
   $r->print('<body bgcolor="#FFFFFF">');      $r->print(&Apache::loncommon::start_page('Resource Differences'));
   
       
   $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 (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
    $r->print('<h3><span class="LC_diff_coauthor">Co-Author: '.$cuname.' at '.$cudom.
     '</span></h3>');
       }
   
  if (&Apache::lonnet::fileembstyle(($ENV{'form.filename'}=~/\.(\w+)$/)) eq  
       'ssi') {  
   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;  
  }  
       }  
   } 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') {  
       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;  
  }  
       }  
   } 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));        
   }  
   
       if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi'
    || $efn =~ /\.meta$/) {
    $r->print('<p><span class="LC_diff_removed">');
    if ($env{'form.versionone'} eq 'priv') {
       my $fn='/home/'.$cuname.'/public_html/'.$efn;
       @f1=&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.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('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
       } else {
    $fn.=$efn;
    $r->print('<b>'.&mt('Current Version').'</b>');
       }
       @f1=&get_split_file($fn,'remote');
    }
   
    $r->print('</span><br />'.&mt('versus').'<br /><span class="LC_diff_added">');
   
    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,$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('<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('</span></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>');   $r->print('<pre>');
   
   foreach $chunk (@$diffs) {   foreach $chunk (@$diffs) {
     
     foreach $line (@$chunk) {      foreach $line (@$chunk) {
       my ($sign, $lineno, $text) = @$line;   my ($sign, $lineno, $text) = @$line;
       $text=~s/\</\&lt\;/g;   $text=&HTML::Entities::encode($text,'<>&"');
       $text=~s/\>/\&gt\;/g;   $lineno=substr($lineno.'        ',0,7);
       $lineno=substr($lineno.'        ',0,7);   $r->print('<span class="'.(($sign eq '+')?'LC_diff_added'
       $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.                                                           :'LC_diff_removed').'">'.
                 $sign.' '.$lineno.' '.$text."</font>\n");    $sign.' '.$lineno.' '.$text."</span>\n");
       }
       $r->print("</pre><hr /><pre>\n");
    }
    $r->print('</pre>');
   
       } else {
    $r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>');
     }      }
     $r->print("<hr>\n");      $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
   }      $r->print(&Apache::loncommon::end_page()); 
   $r->print('</pre>');      return OK;  
   
 } else {  
     $r->print('<h1><font color=red>Binary File</font></h1>');  
 }  
   $r->print('</body></html>');  
   return OK;    
 }  }
   
   
Removed from v.1.3  
changed lines
  Added in v.1.21

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