--- loncom/interface/lonparmset.pm 2005/03/17 21:08:43 1.186 +++ loncom/interface/lonparmset.pm 2005/03/17 22:12:52 1.187 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.186 2005/03/17 21:08:43 www Exp $ +# $Id: lonparmset.pm,v 1.187 2005/03/17 22:12:52 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -75,12 +75,6 @@ my %keyp; my %maptitles; -my $uname; -my $udom; -my $uhome; -my $csec; -my $coursename; - ################################################## ################################################## @@ -113,7 +107,7 @@ Returns: A list, the first item is the ################################################## ################################################## sub parmval { - my ($what,$id,$def)=@_; + my ($what,$id,$def,$uname,$udom,$csec)=@_; my $result=''; my @outpar=(); # ----------------------------------------------------- Cascading lookup scheme @@ -207,8 +201,11 @@ sub parmval { # - level # - new value # - new type +# - username +# - userdomain + sub storeparm { - my ($sresid,$spnam,$snum,$nval,$ntype)=@_; + my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_; $spnam=~s/\_([^\_]+)$/\.$1/; # ---------------------------------------------------------- Construct prefixes @@ -507,16 +504,16 @@ ENDHEAD sub print_row { my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone, - $defbgtwo,$parmlev)=@_; + $defbgtwo,$parmlev,$uname,$udom,$csec)=@_; # get the values for the parameter in cascading order # empty levels will remain empty my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which}, - $rid,$$default{$which}); + $rid,$$default{$which},$uname,$udom,$csec); # get the type for the parameters # problem: these may not be set for all levels my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'. $$name{$which}.'.type', - $rid,$$defaulttype{$which}); + $rid,$$defaulttype{$which},$uname,$udom,$csec); # cascade down manually my $cascadetype=$$defaulttype{$which}; for (my $i=11;$i>0;$i--) { @@ -774,8 +771,14 @@ sub assessparms { my %allmaps=(); my %alllevs=(); + my $uname; + my $udom; + my $uhome; + my $csec; + + my $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + $alllevs{'Resource Level'}='full'; -# $alllevs{'Resource Level [BRIEF]'}='brief'; $alllevs{'Map Level'}='map'; $alllevs{'Course Level'}='general'; @@ -811,10 +814,6 @@ sub assessparms { my $parmlev=''; my $trimheader=''; my $prevvisit=$ENV{'form.prevvisit'}; - -# unless ($parmlev==$ENV{'form.parmlev'}) { -# $parmlev = 'full'; -# } unless ($ENV{'form.parmlev'}) { $parmlev = 'map'; @@ -912,7 +911,8 @@ sub assessparms { if ($ENV{'form.pres_marker'}) { $message.=&storeparm(split(/\&/,$ENV{'form.pres_marker'}), $ENV{'form.pres_value'}, - $ENV{'form.pres_type'}); + $ENV{'form.pres_type'}, + $uname,$udom,$csec); # ---------------------------------------------------------------- Done storing $message.='