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

Diff for /loncom/publisher/londiff.pm between versions 1.16 and 1.17

version 1.16, 2005/04/07 06:56:26 version 1.17, 2005/05/29 01:46:16
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 #  
 # (Handler to retrieve an old version of a file  
 #  
 # (Publication Handler  
 #   
 # (TeX Content Handler  
 #  
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)  
 #  
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer  
 # 03/23 Guy Albertelli  
 # 03/24,03/29 Gerd Kortemeyer)  
 #  
 # 03/31,04/03 Gerd Kortemeyer)  
 #  
 # 05/02/01,05/09 Gerd Kortemeyer  
 #  
 ###  ###
   
 package Apache::londiff;  package Apache::londiff;
Line 90  sub handler { Line 73  sub handler {
 # Get query string for limited number of parameters  # Get query string for limited number of parameters
   
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                        ['filename','versiontwo','versionone']);     ['filename','versiontwo','versionone','filetwo']);
 # Get the files  # Get the files
   
   my $cuname=$env{'user.name'};    my $cuname=$env{'user.name'};
Line 98  sub handler { Line 81  sub handler {
   
   if ($env{'form.filename'}=~/^\/res\//) {    if ($env{'form.filename'}=~/^\/res\//) {
       ($cudom,$cuname,$env{'form.filename'})=        ($cudom,$cuname,$env{'form.filename'})=
        ($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);    ($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);
   } else {    } else {
    unless (($cuname,$cudom)=        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.
          ' trying to get diffs file '.$env{'form.filename'}.   ' trying to get diffs file '.$env{'form.filename'}.
          '  - 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'};
   
   $efn=~s/\/\~(\w+)//g;    $efn=~s/\/\~(\w+)//g;
Line 126  sub handler { Line 109  sub handler {
   $r->print(&Apache::loncommon::bodytag('Resource Differences'));    $r->print(&Apache::loncommon::bodytag('Resource Differences'));
   
       
   $r->print('<h1>'.&mt('Compare versions of').' <tt>'.$efn.'</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'})) {         if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
           $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.            $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
Line 134  sub handler { Line 118  sub handler {
       }        }
   
   
  if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq   if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi') {
       'ssi') {       $r->print('<p><font color="red">');
   $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;   @f1=&get_split_file($fn,'local');
       @f1=&get_split_file($fn,'local');   $r->print('<b>'.&mt('Construction Space Version').'</b>');
       $r->print('<b>'.&mt('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('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
  $r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');   } else {
       } else {       $fn.=$efn;
          $fn.=$efn;       $r->print('<b>'.&mt('Current Version').'</b>');
  $r->print('<b>'.&mt('Current Version').'</b>');   }
       }   @f1=&get_split_file($fn,'remote');
       @f1=&get_split_file($fn,'remote');       }
   }  
        $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');
   $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');  
        if ($env{'form.filetwo'}) {
   if ($env{'form.versiontwo'} eq 'priv') {           my $efn2=$env{'form.filetwo'};
       my $fn='/home/'.$cuname.'/public_html/'.$efn;   $efn2=~s/\/\~(\w+)//g;
       @f2=&get_split_file($fn,'local');   my $fn='/home/'.$cuname.'/public_html/'.$efn2;
       $r->print('<b>'.&mt('Construction Space Version').'</b>');   @f2=&get_split_file($fn,'local');
   } else {   $r->print('<tt>'.$efn2.'</tt>');
       my $fn=       } elsif ($env{'form.versiontwo'} eq 'priv') {
        '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';   my $fn='/home/'.$cuname.'/public_html/'.$efn;
       if ($env{'form.versiontwo'}) {   @f2=&get_split_file($fn,'local');
          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);   $r->print('<b>'.&mt('Construction Space Version').'</b>');
          $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;       } else {
  $r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');   my $fn=
       } else {       '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
          $fn.=$efn;   if ($env{'form.versiontwo'}) {
  $r->print('<b>'.&mt('Current Version').'</b>');       my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
       }       $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
       @f2=&get_split_file($fn,'remote');       $r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');
   }   } else {
   $r->print('</font></p>');       $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>');       $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=~s/\</\&lt\;/g;
       $text=~s/\>/\&gt\;/g;       $text=~s/\>/\&gt\;/g;
       $lineno=substr($lineno.'        ',0,7);       $lineno=substr($lineno.'        ',0,7);
       $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.       $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
                 $sign.' '.$lineno.' '.$text."</font>\n");         $sign.' '.$lineno.' '.$text."</font>\n");
     }   }
     $r->print("<hr>\n");   $r->print("<hr>\n");
   }       }
   $r->print('</pre>');       $r->print('</pre>');
        
 } else {   } else {
     $r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>');       $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></body></html>');     $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center></body></html>'); 
   return OK;      return OK;  
 }  }
Removed from v.1.16  
changed lines
  Added in v.1.17

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