--- loncom/interface/lonparmset.pm 2000/11/23 20:50:41 1.7 +++ loncom/interface/lonparmset.pm 2000/11/24 15:27:27 1.8 @@ -9,7 +9,7 @@ # # 10/11,10/12,10/16 Gerd Kortemeyer) # -# 11/20,11/21,11/22,11/23 Gerd Kortemeyer +# 11/20,11/21,11/22,11/23,11/24 Gerd Kortemeyer package Apache::lonparmset; @@ -25,6 +25,8 @@ my %useropt; my %bighash; my %parmhash; +my @outpar; + my @ids; my %symbp; my %typep; @@ -41,6 +43,7 @@ my $fcat; sub parmval { my ($what,$id)=@_; + my $result=''; # ----------------------------------------------------- Cascading lookup scheme my $symbparm=$symbp{$id}.'.'.$what; my $reslevel= @@ -52,23 +55,29 @@ sub parmval { $ENV{'request.course.id'}.'.'.$what; # ----------------------------------------------------------- first, check user - - if ($uname) { - if ($useropt{$reslevel}) { return $useropt{$reslevel}; } - if ($useropt{$seclevel}) { return $useropt{$seclevel}; } - if ($useropt{$courselevel}) { return $useropt{$courselevel}; } + + if ($uname) { + if ($useropt{$reslevel}) { $result=$useropt{$reslevel}; + $outpar[1]=$result; } + if ($useropt{$seclevel}) { $result=$useropt{$seclevel}; + $outpar[2]=$result; } + if ($useropt{$courselevel}) { $result=$useropt{$courselevel}; + $outpar[3]=$result; } } - # -------------------------------------------------------- second, check course - if ($courseopt{$reslevel}) { return $courseopt{$reslevel}; } - if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } - if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } + if ($courseopt{$reslevel}) { $result=$courseopt{$reslevel}; + $outpar[4]=$result; } + if ($courseopt{$seclevel}) { $result=$courseopt{$seclevel}; + $outpar[5]=$result; } + if ($courseopt{$courselevel}) { $result=$courseopt{$courselevel}; + $outpar[6]=$result; } # ------------------------------------------------------ third, check map parms my $thisparm=$parmhash{$symbparm}; - if ($thisparm) { return $thisparm; } + if ($thisparm) { $result=$thisparm; + $outpar[7]=$result; } # --------------------------------------------- last, look in resource metadata @@ -81,10 +90,11 @@ sub parmval { } if (join('',@content)=~ /\<$what[^\>]*\>([^\<]*)\<\/$what\>/) { - return $1; + $result=$1; + $outpar[8]=$result; } } - return ''; + return $result; } # ---------------------------------------------------------------- Sort routine @@ -102,8 +112,8 @@ sub bycat { sub plink { my ($type,$dis,$value,$marker,$return,$call)=@_; return ''. - (($type=~/^date/)?localtime($value):$value).''; + .$marker."','".$return."','".$call."'".');">'. + ($value?(($type=~/^date/)?localtime($value):$value):' ').''; } # ================================================================ Main Handler @@ -141,7 +151,7 @@ sub handler { } if ($uhome eq 'no_host') { $message= - "