--- loncom/publisher/londiff.pm 2001/12/04 15:34:57 1.6 +++ loncom/publisher/londiff.pm 2004/03/11 22:44:01 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.6 2001/12/04 15:34:57 albertel Exp $ +# $Id: londiff.pm,v 1.15 2004/03/11 22:44:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,6 +41,8 @@ # 03/31,04/03 Gerd Kortemeyer) # # 05/02/01,05/09 Gerd Kortemeyer +# +### package Apache::londiff; @@ -50,6 +52,36 @@ use File::Copy; use Algorithm::Diff qw(diff); use Apache::Constants qw(:common :http :methods); use Apache::loncacc; +use Apache::lonnet(); +use Apache::loncommon(); +use Apache::lonlocal; + + +sub get_split_file { + my ($fn,$style)=@_; + my $f1; + my @f1; + if ($style='local') { + if (-e $fn) { + my $fh=Apache::File->new($fn); + my $line; + while($line=<$fh>) { + $f1.=$line; + } + } + } elsif ($style eq 'remote') { + my $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)); + } + return @f1; +} sub handler { @@ -57,24 +89,18 @@ sub handler { # Get query string for limited number of parameters - map { - my ($name, $value) = split(/=/,$_); - $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'})); - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['filename','versiontwo','versionone']); # Get the files my $cuname=$ENV{'user.name'}; 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'}, $r->dir_config('lonDefDomain'))) { $r->log_reason($cuname.' at '.$cudom. @@ -82,6 +108,7 @@ sub handler { ' - not authorized', $r->filename); return HTTP_NOT_ACCEPTABLE; + } } my $efn=$ENV{'form.filename'}; @@ -91,15 +118,15 @@ sub handler { my @f1=(); my @f2=(); - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print('LON-CAPA Construction Diffs'); - $r->print(''); + $r->print(&Apache::loncommon::bodytag('Resource Differences')); - $r->print('

Compare versions of '.$efn.'

'); + $r->print('

'.&mt('Compare versions of').' '.$efn.'

'); if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) { $r->print('

Co-Author: '.$cuname.' at '.$cudom. @@ -107,60 +134,47 @@ sub handler { } - if (&Apache::lonnet::fileembstyle(($efn=~/\.(\w+)$/)) eq + if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi') { + $r->print('

'); if ($ENV{'form.versionone'} eq 'priv') { my $fn='/home/'.$cuname.'/public_html/'.$efn; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f1[$#f1+1]=$line; - } - } - $r->print('

Construction Space Version

'); + @f1=&get_split_file($fn,'local'); + $r->print(''.&mt('Construction Space Version').''); } else { my $fn= '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/'; if ($ENV{'form.versionone'}) { my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/); $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix; - $r->print('

Version '.$ENV{'form.versionone'}.'

'); + $r->print(''.&mt('Version').' '.$ENV{'form.versionone'}.''); } else { $fn.=$efn; - $r->print('

Current Version

'); + $r->print(''.&mt('Current Version').''); } - @f1=split(/\n/,&Apache::lonnet::getfile($fn)); + @f1=&get_split_file($fn,'remote'); } - $r->print('versus'); + $r->print('
'.&mt('versus').'
'); if ($ENV{'form.versiontwo'} eq 'priv') { my $fn='/home/'.$cuname.'/public_html/'.$efn; - if (-e $fn) { - my $fh=Apache::File->new($fn); - my $line; - while($line=<$fh>) { - chomp($line); - $f2[$#f2+1]=$line; - } - } - $r->print('

Construction Space Version

'); + @f2=&get_split_file($fn,'local'); + $r->print(''.&mt('Construction Space Version').''); } else { my $fn= '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; if ($ENV{'form.versiontwo'}) { my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/); $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix; - $r->print('

Version '.$ENV{'form.versiontwo'}.'

'); + $r->print(''.&mt('Version').' '.$ENV{'form.versiontwo'}.''); } else { $fn.=$efn; - $r->print('

Current Version

'); + $r->print(''.&mt('Current Version').''); } - @f2=split(/\n/,&Apache::lonnet::getfile($fn)); + @f2=&get_split_file($fn,'remote'); } - + $r->print('

'); # Run diff my $diffs = diff(\@f1, \@f2); @@ -187,9 +201,9 @@ sub handler { $r->print(''); } else { - $r->print('

Binary File

'); + $r->print('

'.&mt('Binary File').'

'); } - $r->print(''); + $r->print('
'.&mt('Close This Window').'
'); return OK; }