--- loncom/publisher/londiff.pm 2003/12/10 15:42:49 1.13 +++ 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.13 2003/12/10 15:42:49 sakharuk Exp $ +# $Id: londiff.pm,v 1.15 2004/03/11 22:44:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,6 +56,33 @@ 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 { my $r=shift; @@ -91,12 +118,12 @@ 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(&Apache::loncommon::bodytag(&mt('Resource Differences'))); + $r->print(&Apache::loncommon::bodytag('Resource Differences')); $r->print('

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

'); @@ -112,14 +139,7 @@ sub handler { $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; - } - } + @f1=&get_split_file($fn,'local'); $r->print(''.&mt('Construction Space Version').''); } else { my $fn= @@ -132,21 +152,14 @@ sub handler { $fn.=$efn; $r->print(''.&mt('Current Version').''); } - @f1=split(/\n/,&Apache::lonnet::getfile($fn)); + @f1=&get_split_file($fn,'remote'); } $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; - } - } + @f2=&get_split_file($fn,'local'); $r->print(''.&mt('Construction Space Version').''); } else { my $fn= @@ -159,7 +172,7 @@ sub handler { $fn.=$efn; $r->print(''.&mt('Current Version').''); } - @f2=split(/\n/,&Apache::lonnet::getfile($fn)); + @f2=&get_split_file($fn,'remote'); } $r->print('

'); # Run diff