--- loncom/publisher/londiff.pm	2003/08/13 15:20:11	1.12
+++ loncom/publisher/londiff.pm	2006/05/17 13:41:45	1.19
@@ -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.19 2006/05/17 13:41:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,23 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-#
-# (Handler to retrieve an old version of a file
-#
-# (Publication Handler
-# 
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer)
-#
-# 03/31,04/03 Gerd Kortemeyer)
-#
-# 05/02/01,05/09 Gerd Kortemeyer
-#
 ###
 
 package Apache::londiff;
@@ -49,11 +32,45 @@ package Apache::londiff;
 use strict;
 use Apache::File;
 use File::Copy;
+use File::Compare;
 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 eq '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 are_different_files {
+    my ($fileone,$filetwo)=@_;
+    return &compare($fileone,$filetwo);
+}
 
 sub handler {
 
@@ -62,134 +79,125 @@ sub handler {
 # Get query string for limited number of parameters
 
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                       ['filename','versiontwo','versionone']);
+			   ['filename','versiontwo','versionone','filetwo']);
 # 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'},
-                                      $r->dir_config('lonDefDomain'))) {
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to get diffs file '.$ENV{'form.filename'}.
-         '  - not authorized', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-   }
+      unless (($cuname,$cudom)=
+	      &Apache::loncacc::constructaccess($env{'form.filename'},
+						$r->dir_config('lonDefDomain'))) {
+	  $r->log_reason($cuname.' at '.$cudom.
+			 ' 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('<html><head><title>LON-CAPA Construction Diffs</title></head>');
-
-  $r->print(&Apache::loncommon::bodytag('Resource Differences'));
+  $r->print(&Apache::loncommon::start_page('Resource Differences'));
 
   
-  $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');
+  $r->print('<h1>'.($env{'form.filetwo'}?'':&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>');
       }
 
 
- if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq
-      'ssi') {
-  $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;
+ if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi') {
+     $r->print('<p><font color="red">');
+     if ($env{'form.versionone'} eq 'priv') {
+	 my $fn='/home/'.$cuname.'/public_html/'.$efn;
+	 @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>'.&mt('Version').' '.$env{'form.versionone'}.'</b>');
+	 } else {
+	     $fn.=$efn;
+	     $r->print('<b>'.&mt('Current Version').'</b>');
 	 }
-      }
-      $r->print('<b>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>');
-      } else {
-         $fn.=$efn;
-	 $r->print('<b>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;
+     if ($env{'form.filetwo'}) {
+         my $efn2=$env{'form.filetwo'};
+	 $efn2=~s/\/\~(\w+)//g;
+	 my $fn='/home/'.$cuname.'/public_html/'.$efn2;
+	 @f2=&get_split_file($fn,'local');
+	 $r->print('<tt>'.$efn2.'</tt>');
+     } elsif ($env{'form.versiontwo'} eq 'priv') {
+	 my $fn='/home/'.$cuname.'/public_html/'.$efn;
+	 @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>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>');
+	 } else {
+	     $fn.=$efn;
+	     $r->print('<b>'.&mt('Current Version').'</b>');
 	 }
-      }
-      $r->print('<b>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>');
-      } else {
-         $fn.=$efn;
-	 $r->print('<b>Current Version</b>');
-      }
-      @f2=split(/\n/,&Apache::lonnet::getfile($fn));      
-  }
-  $r->print('</font></p>');
+	 @f2=&get_split_file($fn,'remote');
+     }
+     $r->print('</font></p>');
 # Run diff
 
-  my $diffs = diff(\@f1, \@f2);
+     my $diffs = diff(\@f1, \@f2);
 
 # Start page output
 
-  my $chunk;
-  my $line;
-
-  $r->print('<pre>');
-
-  foreach $chunk (@$diffs) {
+     my $chunk;
+     my $line;
 
-    foreach $line (@$chunk) {
-      my ($sign, $lineno, $text) = @$line;
-      $text=~s/\</\&lt\;/g;
-      $text=~s/\>/\&gt\;/g;
-      $lineno=substr($lineno.'        ',0,7);
-      $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
-                $sign.' '.$lineno.' '.$text."</font>\n");
-    }
-    $r->print("<hr>\n");
-  }
-  $r->print('</pre>');
+     $r->print('<pre>');
 
-} else {
-    $r->print('<h1><font color=red>Binary File</font></h1>');
-}
-  $r->print('<center><a href="javascript:window.close();">Close This Window</a></center></body></html>'); 
+     foreach $chunk (@$diffs) {
+	 
+	 foreach $line (@$chunk) {
+	     my ($sign, $lineno, $text) = @$line;
+	     $text=~s/\</\&lt\;/g;
+	     $text=~s/\>/\&gt\;/g;
+	     $lineno=substr($lineno.'        ',0,7);
+	     $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
+		       $sign.' '.$lineno.' '.$text."</font>\n");
+	 }
+	 $r->print("<hr>\n");
+     }
+     $r->print('</pre>');
+     
+ } else {
+     $r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>');
+ }
+  $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
+  $r->print(&Apache::loncommon::end_page()); 
   return OK;  
 }