--- loncom/publisher/londiff.pm	2005/04/07 06:56:26	1.16
+++ loncom/publisher/londiff.pm	2005/05/29 01:46:16	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to show differences between file versions
 #
-# $Id: londiff.pm,v 1.16 2005/04/07 06:56:26 albertel Exp $
+# $Id: londiff.pm,v 1.17 2005/05/29 01:46:16 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;
@@ -90,7 +73,7 @@ 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'};
@@ -98,19 +81,19 @@ sub handler {
 
   if ($env{'form.filename'}=~/^\/res\//) {
       ($cudom,$cuname,$env{'form.filename'})=
-       ($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);
+	  ($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'};
 
   $efn=~s/\/\~(\w+)//g;
@@ -126,7 +109,8 @@ sub handler {
   $r->print(&Apache::loncommon::bodytag('Resource Differences'));
 
   
-  $r->print('<h1>'.&mt('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'})) {
           $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
@@ -134,75 +118,80 @@ sub handler {
       }
 
 
- 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>');
-      }
-      @f1=&get_split_file($fn,'remote');
-  }
-
-  $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');
-
-  if ($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>');
-      }
-      @f2=&get_split_file($fn,'remote');
-  }
-  $r->print('</font></p>');
+ 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>');
+	 }
+	 @f1=&get_split_file($fn,'remote');
+     }
+
+     $r->print('</font><br />'.&mt('versus').'<br /><font color="green">');
+
+     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>');
+	 }
+	 @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;
+     my $chunk;
+     my $line;
 
-  $r->print('<pre>');
+     $r->print('<pre>');
 
-  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>');
-}
+     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></body></html>'); 
   return OK;  
 }