--- loncom/interface/lonparmset.pm 2000/11/23 20:42:55 1.6 +++ loncom/interface/lonparmset.pm 2000/11/25 19:57:17 1.12 @@ -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; @@ -40,51 +43,82 @@ my $fcat; # -------------------------------------------- Figure out a cascading parameter sub parmval { - my ($what,$id)=@_; + my ($what,$id,$def)=@_; + my $result=''; + @outpar=(); # ----------------------------------------------------- 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 +# -------------------------------------------------------- first, check default - if ($uname) { - if ($useropt{$reslevel}) { return $useropt{$reslevel}; } - if ($useropt{$seclevel}) { return $useropt{$seclevel}; } - if ($useropt{$courselevel}) { return $useropt{$courselevel}; } + if ($def) { $outpar[11]=$def; + $result=11; } + +# ----------------------------------------------------- second, check map parms + + my $thisparm=$parmhash{$symbparm}; + if ($thisparm) { $outpar[10]=$thisparm; + $result=10; } + +# --------------------------------------------------------- third, check course + + if ($courseopt{$courselevel}) { $outpar[9]=$courseopt{$courselevel}; + $result=9; } + + if ($courseopt{$courselevelm}) { $outpar[8]=$courseopt{$courselevelm}; + $result=8; } + + if ($courseopt{$courselevelr}) { $outpar[7]=$courseopt{$courselevelr}; + $result=7; } + + if ($csec) { + + if ($courseopt{$seclevel}) { $outpar[6]=$courseopt{$seclevel}; + $result=6; } + + if ($courseopt{$seclevelm}) { $outpar[5]=$courseopt{$seclevelm}; + $result=5; } + + if ($courseopt{$seclevelr}) { $outpar[4]=$courseopt{$seclevelr}; + $result=4; } + } -# -------------------------------------------------------- second, check course +# ---------------------------------------------------------- fourth, check user + + if ($uname) { - if ($courseopt{$reslevel}) { return $courseopt{$reslevel}; } - if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } - if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } + if ($useropt{$courselevel}) { $outpar[3]=$useropt{$courselevel}; + $result=3; } -# ------------------------------------------------------ third, check map parms + if ($useropt{$courselevelm}) { $outpar[2]=$useropt{$courselevelm}; + $result=2; } - my $thisparm=$parmhash{$symbparm}; - if ($thisparm) { return $thisparm; } - -# --------------------------------------------- last, look in resource metadata + if ($useropt{$courselevelr}) { $outpar[1]=$useropt{$courselevelr}; + $result=1; } - my $filename='/home/httpd/res/'.$bighash{'src_'.$id}.'.meta'; - if (-e $filename) { - my @content; - { - my $fh=Apache::File->new($filename); - @content=<$fh>; - } - if (join('',@content)=~ - /\<$what[^\>]*\>([^\<]*)\<\/$what\>/) { - return $1; - } - } - return ''; + } + + return $result; } # ---------------------------------------------------------------- Sort routine @@ -97,13 +131,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 @@ -131,22 +173,52 @@ sub handler { %symbp=(); %typep=(); - $uname=$ENV{'form.uname'}; + my $message=''; + + $csec=$ENV{'form.csec'}; $udom=$ENV{'form.udom'}; + my $id=$ENV{'form.id'}; + if (($id) && ($udom)) { + $uname=(&Apache::lonnet::idget($udom,$id))[1]; + if ($uname) { + $id=''; + } else { + $message= + "
\nFull Name: ".
+ $name{'firstname'}.' '.$name{'middlename'}
+ .$name{'lastname'}.' '.$name{'generation'}.
+ "
\nID: ".$name{'id'}.'
'; + } + } } - $csec=$ENV{'form.csec'}; unless ($csec) { $csec=''; } + $fcat=$ENV{'form.fcat'}; unless ($fcat) { $fcat=''; } @@ -187,8 +259,9 @@ sub handler { if ($bighash{$_}=~/\.(problem|exam|quiz|assess|survey|form)$/) { $ids[$#ids+1]=$id; $typep{$id}=$1; - $symbp{$id}= - &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}). + $mapp{$id}= + &Apache::lonnet::declutter($bighash{'map_id_'.$mapid}); + $symbp{$id}=$mapp{$id}. '___'.$resid.'___'. &Apache::lonnet::declutter($bighash{$_}); } @@ -222,67 +295,149 @@ sub handler {