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

Diff for /loncom/publisher/londiff.pm between versions 1.20 and 1.24

version 1.20, 2006/09/13 21:43:26 version 1.24, 2008/11/10 13:20:04
Line 27 Line 27
 #  #
 ###  ###
   
   =pod
   
   =head1 NAME
   
   Apache::londiff
   
   =head1 SYNOPSIS
   
   Handler to show difference between two files.
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head2 Subroutines
   
   =cut
   
   
 package Apache::londiff;  package Apache::londiff;
   
 use strict;  use strict;
Line 40  use Apache::lonnet; Line 58  use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonretrieve();  use Apache::lonretrieve();
 use Apache::lonlocal;  use Apache::lonlocal;
   use LONCAPA();
   
 sub get_split_file {  sub get_split_file {
     my ($fn,$style)=@_;      my ($fn,$style)=@_;
Line 55  sub get_split_file { Line 73  sub get_split_file {
     }      }
  }   }
     } elsif ($style eq 'remote') {      } elsif ($style eq 'remote') {
  my $f1=&Apache::lonnet::getfile($fn);   $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));        
     }      }
       @f1=split(/\r\n|\r|\n/,$f1);
     return @f1;      return @f1;
 }  }
   
Line 75  sub are_different_files { Line 86  sub are_different_files {
   
 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
   
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
    ['filename','versiontwo','versionone','filetwo']);      ['filename','versiontwo',
        'versionone','filetwo']);
 # 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'};
   
   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'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$});
   } 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.':'.$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{/\~($LONCAPA::username_re)}{}g;
   
   my @f1=();      my @f1=();
   my @f2=();      my @f2=();
   
   &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;      $r->send_http_header;
   
   $r->print(&Apache::loncommon::start_page('Resource Differences'));      $r->print(&Apache::loncommon::start_page('Resource Differences'));
   
       
   $r->print('<h1>'.($env{'form.filetwo'}?'':&mt('Compare versions of')).      $r->print('<h1>'.($env{'form.filetwo'}?'':&mt('Compare versions of')).
     ' <tt>'.$efn.'</tt></h1>');        ' <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><span class="LC_diff_coauthor">Co-Author: '.$cuname.' at '.$cudom.
                '</font></h3>');    '</span></h3>');
       }      }
   
   
  if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi'  
      || $efn =~ /\.meta$/) {  
      $r->print('<p><font color="red">');  
      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('</font><br />'.&mt('versus').'<br /><font color="green">');  
   
      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('</font></p>');  
 # Run diff  
   
      my $diffs = diff(\@f1, \@f2);  
   
 # Start page output      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">');
   
      my $chunk;   if ($env{'form.filetwo'}) {
      my $line;      my $efn2=$env{'form.filetwo'};
       $efn2=~s{/\~($LONCAPA::username_re)}{}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
   
    my $diffs = diff(\@f1, \@f2);
   
   # Start page output
   
      $r->print('<pre>');   my $chunk;
    my $line;
   
      foreach $chunk (@$diffs) {   $r->print('<pre>');
   
    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("<hr>\n");      $r->print("</pre><hr /><pre>\n");
      }   }
      $r->print('</pre>');   $r->print('</pre>');
        
  } else {      } else {
      $r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>');   $r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>');
  }      }
   $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');      $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
   $r->print(&Apache::loncommon::end_page());       $r->print(&Apache::loncommon::end_page()); 
   return OK;        return OK;  
 }  }
   
   
Removed from v.1.20  
changed lines
  Added in v.1.24

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