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

Diff for /loncom/publisher/londiff.pm between versions 1.5 and 1.12

version 1.5, 2001/05/09 17:38:12 version 1.12, 2003/08/13 15:20:11
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 16 Line 41
 # 03/31,04/03 Gerd Kortemeyer)  # 03/31,04/03 Gerd Kortemeyer)
 #  #
 # 05/02/01,05/09 Gerd Kortemeyer  # 05/02/01,05/09 Gerd Kortemeyer
   #
   ###
   
 package Apache::londiff;  package Apache::londiff;
   
Line 25  use File::Copy; Line 52  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::loncacc;
   use Apache::lonnet();
   use Apache::loncommon();
   
 sub handler {  sub handler {
   
Line 32  sub handler { Line 61  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 $cuname=$ENV{'user.name'};
   my $cudom=$ENV{'user.domain'};    my $cudom=$ENV{'user.domain'};
   
   unless (($cuname,$cudom)=    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'},      &Apache::loncacc::constructaccess($ENV{'form.filename'},
                                       $r->dir_config('lonDefDomain'))) {                                        $r->dir_config('lonDefDomain'))) {
      $r->log_reason($cuname.' at '.$cudom.       $r->log_reason($cuname.' at '.$cudom.
Line 57  sub handler { Line 80  sub handler {
          '  - not authorized',            '  - not authorized', 
          $r->filename);            $r->filename); 
      return HTTP_NOT_ACCEPTABLE;       return HTTP_NOT_ACCEPTABLE;
      }
   }    }
   
   my $efn=$ENV{'form.filename'};    my $efn=$ENV{'form.filename'};
Line 71  sub handler { Line 95  sub handler {
   
   $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');    $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
   
   $r->print('<body bgcolor="#FFFFFF">');    $r->print(&Apache::loncommon::bodytag('Resource Differences'));
   
       
   $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');    $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');
Line 82  sub handler { Line 106  sub handler {
       }        }
   
   
  if (&Apache::lonnet::fileembstyle(($efn=~/\.(\w+)$/)) eq   if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
       'ssi') {        'ssi') {
     $r->print('<p><font color="red">');
   if ($ENV{'form.versionone'} eq 'priv') {    if ($ENV{'form.versionone'} eq 'priv') {
       my $fn='/home/'.$cuname.'/public_html/'.$efn;        my $fn='/home/'.$cuname.'/public_html/'.$efn;
       if (-e $fn) {        if (-e $fn) {
Line 94  sub handler { Line 119  sub handler {
              $f1[$#f1+1]=$line;               $f1[$#f1+1]=$line;
  }   }
       }        }
       $r->print('<h3>Construction Space Version</h3>');        $r->print('<b>Construction Space Version</b>');
   } else {    } else {
       my $fn=        my $fn=
        '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';         '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
       if ($ENV{'form.versionone'}) {        if ($ENV{'form.versionone'}) {
          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);           my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;           $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
  $r->print('<h3>Version '.$ENV{'form.versionone'}.'</h3>');   $r->print('<b>Version '.$ENV{'form.versionone'}.'</b>');
       } else {        } else {
          $fn.=$efn;           $fn.=$efn;
  $r->print('<h3>Current Version</h3>');   $r->print('<b>Current Version</b>');
       }        }
       @f1=split(/\n/,&Apache::lonnet::getfile($fn));              @f1=split(/\n/,&Apache::lonnet::getfile($fn));      
   }    }
   
   $r->print('versus');    $r->print('</font><br />versus<br /><font color="green">');
   
   if ($ENV{'form.versiontwo'} eq 'priv') {    if ($ENV{'form.versiontwo'} eq 'priv') {
       my $fn='/home/'.$cuname.'/public_html/'.$efn;        my $fn='/home/'.$cuname.'/public_html/'.$efn;
Line 121  sub handler { Line 146  sub handler {
              $f2[$#f2+1]=$line;               $f2[$#f2+1]=$line;
  }   }
       }        }
       $r->print('<h3>Construction Space Version</h3>');        $r->print('<b>Construction Space Version</b>');
   } else {    } else {
       my $fn=        my $fn=
        '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';         '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
       if ($ENV{'form.versiontwo'}) {        if ($ENV{'form.versiontwo'}) {
          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);           my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;           $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
  $r->print('<h3>Version '.$ENV{'form.versiontwo'}.'</h3>');   $r->print('<b>Version '.$ENV{'form.versiontwo'}.'</b>');
       } else {        } else {
          $fn.=$efn;           $fn.=$efn;
  $r->print('<h3>Current Version</h3>');   $r->print('<b>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);
Line 164  sub handler { Line 189  sub handler {
 } else {  } else {
     $r->print('<h1><font color=red>Binary File</font></h1>');      $r->print('<h1><font color=red>Binary File</font></h1>');
 }  }
   $r->print('</body></html>');    $r->print('<center><a href="javascript:window.close();">Close This Window</a></center></body></html>'); 
   return OK;      return OK;  
 }  }
   
Removed from v.1.5  
changed lines
  Added in v.1.12

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