--- loncom/interface/lonparmset.pm 2000/11/23 20:42:55 1.6 +++ loncom/interface/lonparmset.pm 2000/11/24 20:00:27 1.10 @@ -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,11/25 Gerd Kortemeyer package Apache::lonparmset; @@ -25,8 +25,11 @@ my %useropt; my %bighash; my %parmhash; +my @outpar; + my @ids; my %symbp; +my %mapp; my %typep; my $uname; @@ -41,34 +44,61 @@ my $fcat; sub parmval { my ($what,$id)=@_; + my $result=''; # ----------------------------------------------------- Cascading lookup scheme + my $symbparm=$symbp{$id}.'.'.$what; - my $reslevel= - $ENV{'request.course.id'}.'.'.$symbparm; + my $mapparm=$mapp{$id}.'___(all).'.$what; + my $seclevel= - $ENV{'request.course.id'}.'.'. - $ENV{'request.course.sec'}.'.'.$what; + $ENV{'request.course.id'}.'.['. + $ENV{'request.course.sec'}.'].'.$what; + my $seclevelr= + $ENV{'request.course.id'}.'.['. + $ENV{'request.course.sec'}.'].'.$symbparm; + my $seclevelm= + $ENV{'request.course.id'}.'.['. + $ENV{'request.course.sec'}.'].'.$mapparm; + my $courselevel= $ENV{'request.course.id'}.'.'.$what; + my $courselevelr= + $ENV{'request.course.id'}.'.'.$symbparm; + my $courselevelm= + $ENV{'request.course.id'}.'.'.$mapparm; # ----------------------------------------------------------- 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{$courselevelr}) { $outpar[1]=$useropt{$courselevelr}; + $result=1; } + if ($useropt{$courselevelm}) { $outpar[2]=$useropt{$courselevelm}; + $result=2; } + if ($useropt{$courselevel}) { $outpar[3]=$useropt{$courselevel}; + $result=3; } } # -------------------------------------------------------- second, check course - if ($courseopt{$reslevel}) { return $courseopt{$reslevel}; } - if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } - if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } + if ($courseopt{$seclevelr}) { $outpar[4]=$courseopt{$seclevelr}; + $result=4; } + if ($courseopt{$seclevelm}) { $outpar[5]=$courseopt{$seclevelm}; + $result=5; } + if ($courseopt{$seclevel}) { $outpar[6]=$courseopt{$seclevel}; + $result=6; } + + if ($courseopt{$courselevelr}) { $outpar[7]=$courseopt{$courselevelr}; + $result=7; } + if ($courseopt{$courselevelm}) { $outpar[8]=$courseopt{$courselevelm}; + $result=8; } + if ($courseopt{$courselevel}) { $outpar[9]=$courseopt{$courselevel}; + $result=9; } # ------------------------------------------------------ third, check map parms my $thisparm=$parmhash{$symbparm}; - if ($thisparm) { return $thisparm; } + if ($thisparm) { $outpar[10]=$thisparm; + $result=10; } # --------------------------------------------- last, look in resource metadata @@ -81,10 +111,11 @@ sub parmval { } if (join('',@content)=~ /\<$what[^\>]*\>([^\<]*)\<\/$what\>/) { - return $1; + $outpar[11]=$1; + $result=11; } } - return ''; + return $result; } # ---------------------------------------------------------------- Sort routine @@ -97,13 +128,21 @@ sub bycat { } } +# ------------------------------------------------------------ Output for value + +sub valout { + my ($value,$type)=@_; + return + ($value?(($type=~/^date/)?localtime($value):$value):' '); +} + # -------------------------------------------------------- Produces link anchor sub plink { my ($type,$dis,$value,$marker,$return,$call)=@_; return ''. - (($type=~/^date/)?localtime($value):$value).''; + .$marker."','".$return."','".$call."'".');">'. + &valout($value,$type).''; } # ================================================================ Main Handler @@ -141,7 +180,7 @@ sub handler { } if ($uhome eq 'no_host') { $message= - "