[LON-CAPA-cvs] cvs: rat / lonpageflip.pm loncom/homework lonhomework.pm loncom/lonnet/perl lonnet.pm

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 15 Nov 2005 18:39:46 -0000


albertel		Tue Nov 15 13:39:46 2005 EDT

  Modified files:              
    /loncom/homework	lonhomework.pm 
    /loncom/lonnet/perl	lonnet.pm 
    /rat	lonpageflip.pm 
  Log:
  - eliminating dead code
  
  
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.223 loncom/homework/lonhomework.pm:1.224
--- loncom/homework/lonhomework.pm:1.223	Tue Nov 15 13:23:17 2005
+++ loncom/homework/lonhomework.pm	Tue Nov 15 13:38:47 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.223 2005/11/15 18:23:17 albertel Exp $
+# $Id: lonhomework.pm,v 1.224 2005/11/15 18:38:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -939,10 +939,6 @@
 	if ($Apache::lonhomework::browse ne 'F' && 
 	    $env{'request.state'} ne "construct") {
 	    #should know where we are, so ask
-	    if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-		&Apache::lonnet::cleanenv();
-	    }
-	    &Apache::lonnet::logthis(&Apache::lonnet::mod_perl_version());
 	    $request->internal_redirect('/adm/ambiguous'); return OK;
 	}
     }
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.676 loncom/lonnet/perl/lonnet.pm:1.677
--- loncom/lonnet/perl/lonnet.pm:1.676	Tue Nov 15 13:30:41 2005
+++ loncom/lonnet/perl/lonnet.pm	Tue Nov 15 13:39:16 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.676 2005/11/15 18:30:41 albertel Exp $
+# $Id: lonnet.pm,v 1.677 2005/11/15 18:39:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5970,13 +5970,6 @@
     return &unescape($value);
 }
 
-sub mod_perl_version {
-    return 1;
-    if (defined($perlvar{'MODPERL2'})) {
-	return 2;
-    }
-}
-
 sub correct_line_ends {
     my ($result)=@_;
     $$result =~s/\r\n/\n/mg;
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.59 rat/lonpageflip.pm:1.60
--- rat/lonpageflip.pm:1.59	Thu Nov 10 14:16:02 2005
+++ rat/lonpageflip.pm	Tue Nov 15 13:39:45 2005
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.59 2005/11/10 19:16:02 www Exp $
+# $Id: lonpageflip.pm,v 1.60 2005/11/15 18:39:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -459,9 +459,6 @@
           }
       } else {
 # ---------------------------------------- No, could not determine where we are
-	  if ( &Apache::lonnet::mod_perl_version() == 2 ) {
-	      &Apache::lonnet::cleanenv();
-	  }
 	  $r->internal_redirect('/adm/ambiguous');
       }
   } else {