--- loncom/publisher/londiff.pm 2006/12/05 02:55:55 1.22 +++ loncom/publisher/londiff.pm 2007/01/15 18:34:32 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.22 2006/12/05 02:55:55 albertel Exp $ +# $Id: londiff.pm,v 1.23 2007/01/15 18:34:32 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -55,16 +55,9 @@ sub get_split_file { } } } 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)); + $f1=&Apache::lonnet::getfile($fn); } + @f1=split(/\r\n|\r|\n/,$f1); return @f1; }