[LON-CAPA-cvs] cvs: loncom /cgi loncgi.pm /interface printout.pl

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 03 May 2005 22:22:48 -0000


albertel		Tue May  3 18:22:48 2005 EDT

  Modified files:              
    /loncom/interface	printout.pl 
    /loncom/cgi	loncgi.pm 
  Log:
  - sorry screwed up the namespaceing of $env
  
  
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.79 loncom/interface/printout.pl:1.80
--- loncom/interface/printout.pl:1.79	Tue May  3 17:15:28 2005
+++ loncom/interface/printout.pl	Tue May  3 18:22:47 2005
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.79 2005/05/03 21:15:28 albertel Exp $
+# $Id: printout.pl,v 1.80 2005/05/03 22:22:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,7 @@
 use IO::File;
 use Image::Magick;
 use Apache::lonhtmlcommon;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonmsg;
Index: loncom/cgi/loncgi.pm
diff -u loncom/cgi/loncgi.pm:1.3 loncom/cgi/loncgi.pm:1.4
--- loncom/cgi/loncgi.pm:1.3	Thu Apr  7 02:56:21 2005
+++ loncom/cgi/loncgi.pm	Tue May  3 18:22:47 2005
@@ -1,7 +1,7 @@
 #
 # LON-CAPA helpers for cgi-bin scripts
 #
-# $Id: loncgi.pm,v 1.3 2005/04/07 06:56:21 albertel Exp $
+# $Id: loncgi.pm,v 1.4 2005/05/03 22:22:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,8 +60,8 @@
 use LONCAPA::Configuration();
 require Exporter;
 
-our @ISA = qw (Exporter);
-our @EXPORT = qw(%env);
+#our @ISA = qw (Exporter);
+#our @EXPORT = qw(%env);
 
 my $lonidsdir;
 
@@ -156,11 +156,9 @@
     foreach my $envrow (@profile) {
         chomp($envrow);
         my ($envname,$envvalue)=split(/=/,$envrow);
-        $ENV{$envname} = $envvalue;
-        $env{$envname} = $envvalue;
+        $Apache::lonnet::env{$envname} = $envvalue;
     }
-    $ENV{'user.environment'} = "$lonidsdir/$handle.id";
-    $env{'user.environment'} = "$lonidsdir/$handle.id";
+    $Apache::lonnet::env{'user.environment'} = "$lonidsdir/$handle.id";
     return undef;
 }