--- loncom/publisher/londiff.pm	2003/08/13 15:20:11	1.12
+++ 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.12 2003/08/13 15:20:11 www Exp $
+# $Id: londiff.pm,v 1.15 2004/03/11 22:44:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,6 +54,34 @@ use Apache::Constants qw(:common :http :
 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 {
 
@@ -90,7 +118,7 @@ sub handler {
   my @f1=();
   my @f2=();
 
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
   $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
@@ -98,7 +126,7 @@ sub handler {
   $r->print(&Apache::loncommon::bodytag('Resource Differences'));
 
   
-  $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');
+  $r->print('<h1>'.&mt('Compare versions of').' <tt>'.$efn.'</tt></h1>');
    
        if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
           $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
@@ -111,54 +139,40 @@ sub handler {
   $r->print('<p><font color="red">');
   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('<b>Construction Space Version</b>');
+      @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'}) {
          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
-	 $r->print('<b>Version '.$ENV{'form.versionone'}.'</b>');
+	 $r->print('<b>'.&mt('Version').' '.$ENV{'form.versionone'}.'</b>');
       } else {
          $fn.=$efn;
-	 $r->print('<b>Current Version</b>');
+	 $r->print('<b>'.&mt('Current Version').'</b>');
       }
-      @f1=split(/\n/,&Apache::lonnet::getfile($fn));      
+      @f1=&get_split_file($fn,'remote');
   }
 
-  $r->print('</font><br />versus<br /><font color="green">');
+  $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');
 
   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('<b>Construction Space Version</b>');
+      @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'}) {
          my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
-	 $r->print('<b>Version '.$ENV{'form.versiontwo'}.'</b>');
+	 $r->print('<b>'.&mt('Version').' '.$ENV{'form.versiontwo'}.'</b>');
       } else {
          $fn.=$efn;
-	 $r->print('<b>Current Version</b>');
+	 $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
@@ -187,9 +201,9 @@ sub handler {
   $r->print('</pre>');
 
 } else {
-    $r->print('<h1><font color=red>Binary File</font></h1>');
+    $r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>');
 }
-  $r->print('<center><a href="javascript:window.close();">Close This Window</a></center></body></html>'); 
+  $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center></body></html>'); 
   return OK;  
 }
 
