[LON-CAPA-cvs] cvs: loncom /publisher londiff.pm

[albertel]

albertel		Thu Mar 11 17:44:01 2004 EDT

  Modified files:              
    /loncom/publisher	londiff.pm 
  Log:
  - Fixes BUG#2602, line ending changes made diff useless. 
  
  
Index: loncom/publisher/londiff.pm
diff -u loncom/publisher/londiff.pm:1.14 loncom/publisher/londiff.pm:1.15
--- loncom/publisher/londiff.pm:1.14	Wed Dec 10 11:05:43 2003
+++ loncom/publisher/londiff.pm	Thu Mar 11 17:44:01 2004
@@ -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.15 2004/03/11 22:44:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,6 +56,33 @@
 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;
@@ -112,14 +139,7 @@
   $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;
-	 }
-      }
+      @f1=&get_split_file($fn,'local');
       $r->print('<b>'.&mt('Construction Space Version').'</b>');
   } else {
       my $fn=
@@ -132,21 +152,14 @@
          $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') {
       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=
@@ -159,7 +172,7 @@
          $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