[LON-CAPA-cvs] cvs: loncom / startup.pl /enrollment Autoenroll.pl /interface printout.pl /metadata_database parse_activity_log.pl

[albertel]

albertel		Tue Nov 15 15:54:34 2005 EDT

  Modified files:              
    /loncom/metadata_database	parse_activity_log.pl 
    /loncom/interface	printout.pl 
    /loncom/enrollment	Autoenroll.pl 
    /loncom	startup.pl 
  Log:
  - safely try to pull in the compat enviironment where needed
  
  
Index: loncom/metadata_database/parse_activity_log.pl
diff -u loncom/metadata_database/parse_activity_log.pl:1.20 loncom/metadata_database/parse_activity_log.pl:1.21
--- loncom/metadata_database/parse_activity_log.pl:1.20	Tue Sep 20 14:01:01 2005
+++ loncom/metadata_database/parse_activity_log.pl	Tue Nov 15 15:52:02 2005
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network
 #
-# $Id: parse_activity_log.pl,v 1.20 2005/09/20 18:01:01 matthew Exp $
+# $Id: parse_activity_log.pl,v 1.21 2005/11/15 20:52:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,9 @@
 # parameter is not set $logthis is set to &nothing, which does what you
 # would expect.
 #
-
+BEGIN {
+    eval "use Apache2::compat();";
+};
 use strict;
 use DBI;
 use lib '/home/httpd/lib/perl/Apache';
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.92 loncom/interface/printout.pl:1.93
--- loncom/interface/printout.pl:1.92	Mon Oct 31 16:48:07 2005
+++ loncom/interface/printout.pl	Tue Nov 15 15:53:06 2005
@@ -25,6 +25,9 @@
 # http://www.lon-capa.org/
 #
 
+BEGIN {
+    eval "use Apache2::compat();";
+};
 use lib '/home/httpd/lib/perl';
 use LONCAPA::loncgi;
 use File::Path;
Index: loncom/enrollment/Autoenroll.pl
diff -u loncom/enrollment/Autoenroll.pl:1.15 loncom/enrollment/Autoenroll.pl:1.16
--- loncom/enrollment/Autoenroll.pl:1.15	Mon Nov  7 10:43:22 2005
+++ loncom/enrollment/Autoenroll.pl	Tue Nov 15 15:53:50 2005
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 #Automated Enrollment script
-# $Id: Autoenroll.pl,v 1.15 2005/11/07 15:43:22 raeburn Exp $
+# $Id: Autoenroll.pl,v 1.16 2005/11/15 20:53:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,6 +25,9 @@
 #
 # http://www.lon-capa.org/
 #
+BEGIN {
+    eval "use Apache2::compat();";
+};
     use strict;
     use lib '/home/httpd/lib/perl';
     use localenroll;
Index: loncom/startup.pl
diff -u loncom/startup.pl:1.22 loncom/startup.pl:1.23
--- loncom/startup.pl:1.22	Mon Sep 26 17:39:53 2005
+++ loncom/startup.pl	Tue Nov 15 15:54:34 2005
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 BEGIN {
-    eval "use Apache::compat();";
+    eval "use Apache2::compat();";
     eval "use Apache();";
 };
 use lib '/home/httpd/lib/perl';