[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm

[raeburn]

raeburn		Tue Jan 14 21:09:19 2020 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm 
  Log:
  - Reverse part of changes in 1.554.
    $name: third arg in calls to &valout() was never used by routine, so
    remove it.  
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.592 loncom/interface/lonparmset.pm:1.593
--- loncom/interface/lonparmset.pm:1.592	Tue Apr  9 13:45:57 2019
+++ loncom/interface/lonparmset.pm	Tue Jan 14 21:09:19 2020
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.592 2019/04/09 13:45:57 raeburn Exp $
+# $Id: lonparmset.pm,v 1.593 2020/01/14 21:09:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -976,7 +976,6 @@
 #
 # @param {string} $value - the parameter value
 # @param {string} $type - the parameter type
-# @param {string} $name - the parameter name (unused)
 # @param {boolean} $editable - Set to true to get an icon when no value is defined.
 sub valout {
     my ($value,$type,$name,$editable)=@_;
@@ -1084,7 +1083,7 @@
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    my $valout = &valout($value,$type,$parmname,1);
+    my $valout = &valout($value,$type,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
               \$hour, \$min, \$sec, \$extra) {
@@ -1716,13 +1715,13 @@
             }
         }
         my ($parmname)=($thismarker=~/\_([^\_]+)$/);
-        $effective_parm = &valout($recursinfo->[0],$recursinfo->[1],$parmname);
+        $effective_parm = &valout($recursinfo->[0],$recursinfo->[1]);
         $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.
                   '<br /><span class="LC_parm_recursive">'.$rectitle.' '.
                   $effparm_level.'</span></td>');
     } else {
         if ($result) {
-            $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$parmname);
+            $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
         }
         if ($eff_groupparm) {
             $effective_parm = $eff_groupparm;
@@ -1739,7 +1738,7 @@
             $sessionvaltype=$$defaulttype{$which};
         }
         $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
-                  &valout($sessionval,$sessionvaltype,$$name{$which}).' '.
+                  &valout($sessionval,$sessionvaltype).' '.
                   '</font></td>');
     }
     $r->print('</tr>');
@@ -1820,7 +1819,7 @@
     }
     if ($nolink) {
         my ($parmname)=((split(/\&/,$mprefix))[1]=~/\_([^\_]+)$/);
-        $r->print(&valout($currval,$currtype,$parmname));
+        $r->print(&valout($currval,$currtype));
     } else {
         $r->print(&plink($currtype,
                          $$display{$value},$currval,
@@ -1860,7 +1859,7 @@
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
         }
-        $grp_parm = &valout($coursereply,$resulttype,$parmname);
+        $grp_parm = &valout($coursereply,$resulttype);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             if ($resultlevel eq 'recursive') {