File:  [LON-CAPA] / loncom / publisher / londiff.pm
Revision 1.10: download - view: text, annotated - select for diffs
Fri Oct 18 13:48:57 2002 UTC (21 years, 7 months ago) by www
Branches: MAIN
CVS tags: version_0_6_2, version_0_6, HEAD
Better mark up and comparison between /res-files.

    1: # The LearningOnline Network with CAPA
    2: # Handler to show differences between file versions
    3: #
    4: # $Id: londiff.pm,v 1.10 2002/10/18 13:48:57 www Exp $
    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: #
   28: #
   29: # (Handler to retrieve an old version of a file
   30: #
   31: # (Publication Handler
   32: # 
   33: # (TeX Content Handler
   34: #
   35: # 05/29/00,05/30,10/11 Gerd Kortemeyer)
   36: #
   37: # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
   38: # 03/23 Guy Albertelli
   39: # 03/24,03/29 Gerd Kortemeyer)
   40: #
   41: # 03/31,04/03 Gerd Kortemeyer)
   42: #
   43: # 05/02/01,05/09 Gerd Kortemeyer
   44: # 12/13 Scott Harrison
   45: #
   46: ###
   47: 
   48: package Apache::londiff;
   49: 
   50: use strict;
   51: use Apache::File;
   52: use File::Copy;
   53: use Algorithm::Diff qw(diff);
   54: use Apache::Constants qw(:common :http :methods);
   55: use Apache::loncacc;
   56: use Apache::lonnet();
   57: use Apache::loncommon();
   58: 
   59: sub handler {
   60: 
   61:   my $r=shift;
   62: 
   63: # Get query string for limited number of parameters
   64: 
   65:    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
   66:                                        ['filename','versiontwo','versionone']);
   67: # Get the files
   68: 
   69:   my $cuname=$ENV{'user.name'};
   70:   my $cudom=$ENV{'user.domain'};
   71: 
   72:   if ($ENV{'form.filename'}=~/^\/res\//) {
   73:       ($cudom,$cuname,$ENV{'form.filename'})=
   74:        ($ENV{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);
   75:   } else {
   76:    unless (($cuname,$cudom)=
   77:     &Apache::loncacc::constructaccess($ENV{'form.filename'},
   78:                                       $r->dir_config('lonDefDomain'))) {
   79:      $r->log_reason($cuname.' at '.$cudom.
   80:          ' trying to get diffs file '.$ENV{'form.filename'}.
   81:          '  - not authorized', 
   82:          $r->filename); 
   83:      return HTTP_NOT_ACCEPTABLE;
   84:    }
   85:   }
   86: 
   87:   my $efn=$ENV{'form.filename'};
   88: 
   89:   $efn=~s/\/\~(\w+)//g;
   90: 
   91:   my @f1=();
   92:   my @f2=();
   93: 
   94:   $r->content_type('text/html');
   95:   $r->send_http_header;
   96: 
   97:   $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
   98: 
   99:   $r->print(&Apache::loncommon::bodytag('Resource Differences'));
  100: 
  101:   
  102:   $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');
  103:    
  104:        if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
  105:           $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
  106:                '</font></h3>');
  107:       }
  108: 
  109: 
  110:  if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
  111:       'ssi') {
  112:   $r->print('<p><font color="red">');
  113:   if ($ENV{'form.versionone'} eq 'priv') {
  114:       my $fn='/home/'.$cuname.'/public_html/'.$efn;
  115:       if (-e $fn) {
  116: 	  my $fh=Apache::File->new($fn);
  117:           my $line;
  118:           while($line=<$fh>) {
  119:              chomp($line);
  120:              $f1[$#f1+1]=$line;
  121: 	 }
  122:       }
  123:       $r->print('<b>Construction Space Version</b>');
  124:   } else {
  125:       my $fn=
  126:        '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
  127:       if ($ENV{'form.versionone'}) {
  128:          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
  129:          $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
  130: 	 $r->print('<b>Version '.$ENV{'form.versionone'}.'</b>');
  131:       } else {
  132:          $fn.=$efn;
  133: 	 $r->print('<b>Current Version</b>');
  134:       }
  135:       @f1=split(/\n/,&Apache::lonnet::getfile($fn));      
  136:   }
  137: 
  138:   $r->print('</font><br />versus<br /><font color="green">');
  139: 
  140:   if ($ENV{'form.versiontwo'} eq 'priv') {
  141:       my $fn='/home/'.$cuname.'/public_html/'.$efn;
  142:       if (-e $fn) {
  143: 	  my $fh=Apache::File->new($fn);
  144:           my $line;
  145:           while($line=<$fh>) {
  146:              chomp($line);
  147:              $f2[$#f2+1]=$line;
  148: 	 }
  149:       }
  150:       $r->print('<b>Construction Space Version</b>');
  151:   } else {
  152:       my $fn=
  153:        '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
  154:       if ($ENV{'form.versiontwo'}) {
  155:          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
  156:          $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
  157: 	 $r->print('<b>Version '.$ENV{'form.versiontwo'}.'</b>');
  158:       } else {
  159:          $fn.=$efn;
  160: 	 $r->print('<b>Current Version</b>');
  161:       }
  162:       @f2=split(/\n/,&Apache::lonnet::getfile($fn));      
  163:   }
  164:   $r->print('</font></p>');
  165: # Run diff
  166: 
  167:   my $diffs = diff(\@f1, \@f2);
  168: 
  169: # Start page output
  170: 
  171:   my $chunk;
  172:   my $line;
  173: 
  174:   $r->print('<pre>');
  175: 
  176:   foreach $chunk (@$diffs) {
  177: 
  178:     foreach $line (@$chunk) {
  179:       my ($sign, $lineno, $text) = @$line;
  180:       $text=~s/\</\&lt\;/g;
  181:       $text=~s/\>/\&gt\;/g;
  182:       $lineno=substr($lineno.'        ',0,7);
  183:       $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
  184:                 $sign.' '.$lineno.' '.$text."</font>\n");
  185:     }
  186:     $r->print("<hr>\n");
  187:   }
  188:   $r->print('</pre>');
  189: 
  190: } else {
  191:     $r->print('<h1><font color=red>Binary File</font></h1>');
  192: }
  193:   $r->print('</body></html>');
  194:   return OK;  
  195: }
  196: 
  197: 
  198: 1;
  199: __END__
  200: 
  201: 
  202: 
  203: 

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