[LON-CAPA-cvs] cvs: rat / lonratparms.pm

[matthew]

matthew		Mon Mar 11 14:54:31 2002 EDT

  Modified files:              
    /rat	lonratparms.pm 
  Log:
  map to foreach, minor misc cleanups.
  
  
Index: rat/lonratparms.pm
diff -u rat/lonratparms.pm:1.8 rat/lonratparms.pm:1.9
--- rat/lonratparms.pm:1.8	Thu Nov 29 14:23:49 2001
+++ rat/lonratparms.pm	Mon Mar 11 14:54:31 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Set parameters inside of the RAT
 #
-# $Id: lonratparms.pm,v 1.8 2001/11/29 19:23:49 www Exp $
+# $Id: lonratparms.pm,v 1.9 2002/03/11 19:54:31 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@
 # 3/1 Gerd Kortemeyer)
 #
 # 03/03/01,06/15,06/25,06/26,06/30,07/02,07/03,07/04 Gerd Kortemeyer
+# 03/11/02 Matthew Hall
 #
 package Apache::lonratparms;
 
@@ -52,7 +53,7 @@
 
 # Get query string for limited number of parameters
 
-    map {
+    foreach (split(/&/,$ENV{'QUERY_STRING'})) {
        my ($name, $value) = split(/=/,$_);
        $value =~ tr/+/ /;
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
@@ -62,7 +63,7 @@
               $ENV{'form.'.$name}=$value;
 	   }
        }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
+    }
 
 
 # ------------------------------------------------------------------- Read file
@@ -74,21 +75,21 @@
   my %display;
   my %value;
   
-  map {
+  foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
       if ($_=~/^parameter\_/) {
          $content{$_}=&Apache::lonnet::metadata($uri,$_);
          $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
          $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display');
       }
-  } split(/\,/,&Apache::lonnet::metadata($uri,'keys'));
+  }
 
 # ---------------------------------------------------------- Current Parameters
 
-  map {
+  foreach (split(/\:/,$ENV{'form.parms'})) {
       my ($ptype,$pname,$pvalue)=split(/\_\_\_/,$_);
       unless ($type{$pname}) { $type{$pname}=$ptype; }
       $value{$pname}=$pvalue;
-  } split(/\:/,$ENV{'form.parms'});
+  } 
   
 # --------------------------------------------------- Print input screen header
     $r->print(<<ENDHEADER);
@@ -143,21 +144,20 @@
 <table border=2>
 <tr><th>Parameter</th><th>Default</th><th>Value</th><th>Set?</th></tr>
 ENDDOCUMENT
-    map {
+    foreach (keys(%content)) {
         my $cur=$content{$_};
+        # Should if(defined($value{$_})) be if(exists($value{$_})) ?
         if (defined($value{$_})) { $cur=$value{$_}; };
-        $r->print('<tr><td><b>'.$display{$_}.'</b><br><tt>'.$_.
-        '</tt></td><td>&nbsp;'.$content{$_}.
-        '</td><td><input type="text" size="10" name="'.$_.'" value="'.$cur.
-        '">&nbsp;<a href='."'".'javascript:pjump("'.
-		  $type{$_}.'","'.
-                  $display{$_}.'",document.parameters.'.$_.
-                  '.value,"'.$_.'","parameters.pres","stpr");'."'>Enter</a>".
-        '</td><td><input type="checkbox" name="def_'.$_.
-        '"');
+        $r->print(<<"END");
+<tr><td><b>$display{$_}</b><br><tt>$_</tt></td>
+<td>&nbsp;$content{$_}</td>
+<td><input type="text" size="10" name="$_" value="$cur">&nbsp;
+<a href='javascript:pjump("$type{$_}","$display{$_}",document.parameters.$_.value,"$_","parameters.pres","stpr");'>Enter</a></td>
+<td><input type="checkbox" name="def_$_" 
+END
         if ($value{$_}) { $r->print(' checked'); }
         $r->print('></td></tr>');
-    } keys %content;
+    }
     $r->print(
         '</table><br><input type="submit" value="Set"></form></body></html>');
     return OK;