--- loncom/publisher/londiff.pm	2003/12/10 16:05:43	1.14
+++ 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.14 2003/12/10 16:05:43 www Exp $
+# $Id: londiff.pm,v 1.16 2005/04/07 06:56:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,10 +52,37 @@ 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 {
 
   my $r=shift;
@@ -66,25 +93,25 @@ 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;
 
@@ -101,7 +128,7 @@ sub handler {
   
   $r->print('<h1>'.&mt('Compare versions of').' <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.
                '</font></h3>');
       }
@@ -110,56 +137,42 @@ sub handler {
  if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
       'ssi') {
   $r->print('<p><font color="red">');
-  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;
-	 }
-      }
+      @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'}) {
+      if ($env{'form.versionone'}) {
          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
-         $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
-	 $r->print('<b>'.&mt('Version').' '.$ENV{'form.versionone'}.'</b>');
+         $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=split(/\n/,&Apache::lonnet::getfile($fn));      
+      @f1=&get_split_file($fn,'remote');
   }
 
   $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');
 
-  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;
-	 }
-      }
+      @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'}) {
+      if ($env{'form.versiontwo'}) {
          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
-         $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
-	 $r->print('<b>'.&mt('Version').' '.$ENV{'form.versiontwo'}.'</b>');
+         $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=split(/\n/,&Apache::lonnet::getfile($fn));      
+      @f2=&get_split_file($fn,'remote');
   }
   $r->print('</font></p>');
 # Run diff