--- loncom/publisher/londiff.pm 2002/10/18 13:48:57 1.10
+++ loncom/publisher/londiff.pm 2005/04/07 06:56:26 1.16
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to show differences between file versions
#
-# $Id: londiff.pm,v 1.10 2002/10/18 13:48:57 www Exp $
+# $Id: londiff.pm,v 1.16 2005/04/07 06:56:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,7 +41,6 @@
# 03/31,04/03 Gerd Kortemeyer)
#
# 05/02/01,05/09 Gerd Kortemeyer
-# 12/13 Scott Harrison
#
###
@@ -53,8 +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::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 {
@@ -66,32 +93,32 @@ sub handler {
['filename','versiontwo','versionone']);
# Get the files
- my $cuname=$ENV{'user.name'};
- my $cudom=$ENV{'user.domain'};
+ my $cuname=$env{'user.name'};
+ my $cudom=$env{'user.domain'};
- if ($ENV{'form.filename'}=~/^\/res\//) {
- ($cudom,$cuname,$ENV{'form.filename'})=
- ($ENV{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);
+ 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->log_reason($cuname.' at '.$cudom.
- ' trying to get diffs file '.$ENV{'form.filename'}.
+ ' trying to get diffs file '.$env{'form.filename'}.
' - not authorized',
$r->filename);
return HTTP_NOT_ACCEPTABLE;
}
}
- my $efn=$ENV{'form.filename'};
+ my $efn=$env{'form.filename'};
$efn=~s/\/\~(\w+)//g;
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');
@@ -99,9 +126,9 @@ sub handler {
$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'})) {
+ if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
$r->print('Co-Author: '.$cuname.' at '.$cudom.
'
');
}
@@ -110,56 +137,42 @@ sub handler {
if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
'ssi') {
$r->print('');
- if ($ENV{'form.versionone'} eq 'priv') {
+ 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'}) {
+ if ($env{'form.versionone'}) {
my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
- $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
- $r->print('Version '.$ENV{'form.versionone'}.'');
+ $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix;
+ $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') {
+ 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'}) {
+ if ($env{'form.versiontwo'}) {
my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
- $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
- $r->print('Version '.$ENV{'form.versiontwo'}.'');
+ $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
+ $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
@@ -188,9 +201,9 @@ sub handler {
$r->print('');
} else {
- $r->print('Binary File
');
+ $r->print(''.&mt('Binary File').'
');
}
- $r->print('