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

Diff for /loncom/publisher/londiff.pm between versions 1.1 and 1.14

version 1.1, 2001/05/02 21:01:47 version 1.14, 2003/12/10 16:05:43
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
 #  #
   # $Id$
   #
   # 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  # (Handler to retrieve an old version of a file
 #  #
 # (Publication Handler  # (Publication Handler
Line 15 Line 40
 #  #
 # 03/31,04/03 Gerd Kortemeyer)  # 03/31,04/03 Gerd Kortemeyer)
 #  #
 # 05/02/01 Gerd Kortemeyer  # 05/02/01,05/09 Gerd Kortemeyer
   #
   ###
   
 package Apache::londiff;  package Apache::londiff;
   
Line 24  use Apache::File; Line 51  use Apache::File;
 use File::Copy;  use File::Copy;
 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 handler {  sub handler {
   
Line 32  sub handler { Line 62  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']);
        $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=();
   
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
   
     $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
   
     $r->print(&Apache::loncommon::bodytag('Resource Differences'));
   
     
     $r->print('<h1>'.&mt('Compare versions of').' <tt>'.$efn.'</tt></h1>');
      
          if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
             $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
                  '</font></h3>');
         }
   
   
    if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
         'ssi') {
     $r->print('<p><font color="red">');
   if ($ENV{'form.versionone'} eq 'priv') {    if ($ENV{'form.versionone'} eq 'priv') {
       my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};        my $fn='/home/'.$cuname.'/public_html/'.$efn;
       if (-e $fn) {        if (-e $fn) {
   my $fh=Apache::File->new($fn);    my $fh=Apache::File->new($fn);
           my $line;            my $line;
Line 59  sub handler { Line 120  sub handler {
              $f1[$#f1+1]=$line;               $f1[$#f1+1]=$line;
  }   }
       }        }
         $r->print('<b>'.&mt('Construction Space Version').'</b>');
   } else {    } else {
       my $fn=        my $fn=
        '/home/httpd/html//res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';         '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
       if ($ENV{'form.versionone'}) {        if ($ENV{'form.versionone'}) {
          my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);           my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;           $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
    $r->print('<b>'.&mt('Version').' '.$ENV{'form.versionone'}.'</b>');
       } else {        } else {
          $fn.=$ENV{'form.filename'};           $fn.=$efn;
    $r->print('<b>'.&mt('Current Version').'</b>');
       }        }
       @f1=split(/\n/,&Apache::lonnet::getfile($fn));              @f1=split(/\n/,&Apache::lonnet::getfile($fn));      
   }    }
   
     $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');
   
   if ($ENV{'form.versiontwo'} eq 'priv') {    if ($ENV{'form.versiontwo'} eq 'priv') {
       my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};        my $fn='/home/'.$cuname.'/public_html/'.$efn;
       if (-e $fn) {        if (-e $fn) {
   my $fh=Apache::File->new($fn);    my $fh=Apache::File->new($fn);
           my $line;            my $line;
Line 82  sub handler { Line 147  sub handler {
              $f2[$#f2+1]=$line;               $f2[$#f2+1]=$line;
  }   }
       }        }
         $r->print('<b>'.&mt('Construction Space Version').'</b>');
   } else {    } else {
       my $fn=        my $fn=
        '/home/httpd/html/res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';         '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
       if ($ENV{'form.versiontwo'}) {        if ($ENV{'form.versiontwo'}) {
          my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);           my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;           $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
    $r->print('<b>'.&mt('Version').' '.$ENV{'form.versiontwo'}.'</b>');
       } else {        } else {
          $fn.=$ENV{'form.filename'};           $fn.=$efn;
    $r->print('<b>'.&mt('Current Version').'</b>');
       }        }
       @f2=split(/\n/,&Apache::lonnet::getfile($fn));              @f2=split(/\n/,&Apache::lonnet::getfile($fn));      
   }    }
     $r->print('</font></p>');
 # Run diff  # Run diff
   
   my $diffs = diff(\@f1, \@f2);    my $diffs = diff(\@f1, \@f2);
   
 # Start page output  # Start page output
   
   $r->content_type('text/html');  
   $r->send_http_header;  
   
   $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');  
   
   $r->print('<body bgcolor="#FFFFFF">');  
   
     
   $r->print('<h1>Compare versions of <tt>'.$ENV{'form.filename'}.'</tt></h1>');  
   
   my $chunk;    my $chunk;
   my $line;    my $line;
   
   $r->print('<table border=2><tr><th>Version '.$ENV{'form.versionone'}.    $r->print('<pre>');
                     '</th><th>Version '.$ENV{'form.versiontwo'}.'</th>');  
   foreach $chunk (@$diffs) {    foreach $chunk (@$diffs) {
     $r->print('</pre></tr><tr><td><pre>');  
     my $presign='-';    
     foreach $line (@$chunk) {      foreach $line (@$chunk) {
       my ($sign, $lineno, $text) = @$line;        my ($sign, $lineno, $text) = @$line;
       if ($sign ne $presign) {  
   $r->print('</pre></td><td><pre>');  
           $presign=$sign;  
       }  
       $text=~s/\</\&lt\;/g;        $text=~s/\</\&lt\;/g;
       $text=~s/\>/\&gt\;/g;        $text=~s/\>/\&gt\;/g;
       $lineno=substr($lineno.'        ',0,8);        $lineno=substr($lineno.'        ',0,7);
       $r->print($lineno.' '.$text."\n");        $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
                   $sign.' '.$lineno.' '.$text."</font>\n");
     }      }
       $r->print("<hr>\n");
   }    }
     $r->print('</pre>');
   
   $r->print('</tr></table>');  } else {
       $r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>');
   $r->print('</body></html>');  }
     $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center></body></html>'); 
   return OK;      return OK;  
 }  }
   
Line 143  __END__ Line 200  __END__
   
   
   
   
Removed from v.1.1  
changed lines
  Added in v.1.14

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