[LON-CAPA-cvs] cvs: modules /gerd/maxima lonmaxima

[albertel]

albertel		Fri Mar  3 18:25:48 2006 EDT

  Modified files:              
    /modules/gerd/maxima	lonmaxima 
  Log:
  - yes we can use strict
  
  
Index: modules/gerd/maxima/lonmaxima
diff -u modules/gerd/maxima/lonmaxima:1.2 modules/gerd/maxima/lonmaxima:1.3
--- modules/gerd/maxima/lonmaxima:1.2	Fri Mar  3 17:35:09 2006
+++ modules/gerd/maxima/lonmaxima	Fri Mar  3 18:25:47 2006
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # Connect to MAXIMA CAS
 #
-# $Id: lonmaxima,v 1.2 2006/03/03 22:35:09 www Exp $
+# $Id: lonmaxima,v 1.3 2006/03/03 23:25:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,11 +30,6 @@
 # http://www.lon-capa.org/
 #
 
-# global variables
-$PREFORK                = 5;        # number of children to maintain
-$MAX_CLIENTS_PER_CHILD  = 5;        # number of clients each child should process
-%children               = ();       # keys are current child process IDs
-$children               = 0;        # current number of children
  
 use IPC::Open3;
 use IO::Select;
@@ -45,8 +40,19 @@
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
  
-# Scary: cannot use strict!!!
-##### use strict;
+use strict;
+
+# global variables
+my $PREFORK                = 5;        # number of children to maintain
+my $MAX_CLIENTS_PER_CHILD  = 5;        # number of clients each child should process
+my %children               = ();       # keys are current child process IDs
+my $children               = 0;        # current number of children
+my $status;                            # string for current status
+
+use vars qw($PREFORK $MAX_CLIENTS_PER_CHILD %children $children $status
+	    $cmd_in $cmd_out $cmd_err $pidfile $port %perlvar $lastlog
+	    $currenthostid $client $server $cmd
+	    );
  
 sub maximareply {
     my $cmd=shift;
@@ -167,9 +173,7 @@
  
 # ---------------------------------- Read loncapa_apache.conf and loncapa.conf
 &status("Read loncapa.conf and loncapa_apache.conf");
-my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
-%perlvar=%{$perlvarref};
-undef $perlvarref;
+%perlvar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};
  
 # ----------------------------- Make sure this process is running from user=www
 my $wwwid=getpwnam('www');
@@ -247,7 +251,7 @@
 while (1) {
     &status('Parent process, sleeping');
     sleep;                          # wait for a signal (i.e., child's death)
-    for ($i = $children; $i < $PREFORK; $i++) {
+    for (my $i = $children; $i < $PREFORK; $i++) {
         &status('Parent process, starting child');
         make_new_child( );           # top up the child pool
     }
@@ -280,7 +284,7 @@
             or die "Can't unblock SIGINT for fork: $!\n";
          
         # handle connections until we've reached $MAX_CLIENTS_PER_CHILD
-        for ($i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
+        for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
 	    &status('Accepting connections');     
             $client = $server->accept( )     or last;
             while ($cmd=<$client>) {