[LON-CAPA-cvs] cvs: loncom /imspackages imsimport.pm /publisher loncfile.pm lonconstruct.pm lonupload.pm testbankimport.pm

[albertel]

albertel		Tue Nov  8 12:58:35 2005 EDT

  Modified files:              
    /loncom/imspackages	imsimport.pm 
    /loncom/publisher	loncfile.pm lonconstruct.pm lonupload.pm 
                     	testbankimport.pm 
  Log:
  - eliminating the inclusion of Apache::Log (it annoys Apache 2 and aache 1 doesn't need it)
  
  
Index: loncom/imspackages/imsimport.pm
diff -u loncom/imspackages/imsimport.pm:1.12 loncom/imspackages/imsimport.pm:1.13
--- loncom/imspackages/imsimport.pm:1.12	Thu Oct 27 14:19:36 2005
+++ loncom/imspackages/imsimport.pm	Tue Nov  8 12:58:22 2005
@@ -27,7 +27,6 @@
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
-use Apache::Log();
 use Apache::lonnet;
 use Apache::imsprocessor;
 use HTML::Parser;
Index: loncom/publisher/loncfile.pm
diff -u loncom/publisher/loncfile.pm:1.72 loncom/publisher/loncfile.pm:1.73
--- loncom/publisher/loncfile.pm:1.72	Fri Aug 26 15:44:16 2005
+++ loncom/publisher/loncfile.pm	Tue Nov  8 12:58:35 2005
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.72 2005/08/26 19:44:16 albertel Exp $
+# $Id: loncfile.pm,v 1.73 2005/11/08 17:58:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,6 @@
 use HTML::Entities();
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
-use Apache::Log ();
 use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonlocal;
@@ -101,16 +100,9 @@
 =cut
 
 sub Debug {
-  
-    # Marshall the parameters.
-  
-    my $r       = shift;
-    my $log     = $r->log;
-    my $message = shift;
-  
     # Put out the indicated message butonly if DEBUG is true.
-  
     if ($DEBUG) {
+	my ($r,$message) = @_;
 	$r->log_reason($message);
     }
 }
Index: loncom/publisher/lonconstruct.pm
diff -u loncom/publisher/lonconstruct.pm:1.30 loncom/publisher/lonconstruct.pm:1.31
--- loncom/publisher/lonconstruct.pm:1.30	Thu Apr  7 02:56:26 2005
+++ loncom/publisher/lonconstruct.pm	Tue Nov  8 12:58:35 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Page Wrapper for Construction
 #
-# $Id: lonconstruct.pm,v 1.30 2005/04/07 06:56:26 albertel Exp $
+# $Id: lonconstruct.pm,v 1.31 2005/11/08 17:58:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,6 @@
 use strict;
 use Apache::Constants qw(:common :http :methods);
 use Apache::lonnet;
-use Apache::Log ();
 use HTML::Entities();
 
 my $DEBUG = 0;
@@ -61,20 +60,12 @@
 =cut
 
 sub Debug {
-  
-  # Marshall the parameters.
-  
-  my $r       = shift;
-  my $log     = $r->log;
-  my $message = shift;
-  
-  # Put out the indicated message butonly if DEBUG is false.
-  
-  if ($DEBUG) {
-    $log->debug($message);
-  }
-}
-
+    # Put out the indicated message but only if DEBUG is true.
+    if ($DEBUG) {
+	my ($r,$message) = @_;
+	$r->log_reason($message);
+    }
+} 
 
 # ================================================================ Main Handler
 
Index: loncom/publisher/lonupload.pm
diff -u loncom/publisher/lonupload.pm:1.29 loncom/publisher/lonupload.pm:1.30
--- loncom/publisher/lonupload.pm:1.29	Thu Apr  7 02:56:27 2005
+++ loncom/publisher/lonupload.pm	Tue Nov  8 12:58:35 2005
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.29 2005/04/07 06:56:27 albertel Exp $
+# $Id: lonupload.pm,v 1.30 2005/11/08 17:58:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,6 @@
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
-use Apache::Log();
 use Apache::lonnet;
 use HTML::Entities();
 use Apache::lonlocal;
@@ -46,17 +45,10 @@
 my $DEBUG=0;
 
 sub Debug {
-  
-    # Marshall the parameters.
-  
-    my $r       = shift;
-    my $log     = $r->log;
-    my $message = shift;
-  
-    # Put out the indicated message butonly if DEBUG is false.
-  
+    # Put out the indicated message but only if DEBUG is true.
     if ($DEBUG) {
-	$log->debug($message);
+	my ($r,$message) = @_;
+	$r->log_reason($message);
     }
 }
 
Index: loncom/publisher/testbankimport.pm
diff -u loncom/publisher/testbankimport.pm:1.6 loncom/publisher/testbankimport.pm:1.7
--- loncom/publisher/testbankimport.pm:1.6	Thu Apr  7 02:56:27 2005
+++ loncom/publisher/testbankimport.pm	Tue Nov  8 12:58:35 2005
@@ -1,5 +1,5 @@
 # Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.6 2005/04/07 06:56:27 albertel Exp $
+# $Id: testbankimport.pm,v 1.7 2005/11/08 17:58:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,6 @@
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
-use Apache::Log();
 use Apache::lonnet;
 use HTML::Entities();
 use Apache::lonlocal;