--- loncom/interface/lonparmset.pm 2000/11/21 12:22:29 1.2 +++ loncom/interface/lonparmset.pm 2000/11/21 22:57:53 1.3 @@ -23,11 +23,9 @@ my %useropt; my %bighash; my %parmhash; -my @srcp; -my @typep; -my @resp; -my @mapp; -my @symbp; +my @ids; +my %symbp; +my %typep; my $uname; my $udom; @@ -35,12 +33,14 @@ my $uhome; my $csec; +my $fcat; + # -------------------------------------------- Figure out a cascading parameter sub parmval { - my ($what,$idx)=@_; + my ($what,$id)=@_; # ----------------------------------------------------- Cascading lookup scheme - my $symbparm=$symbp[$idx].'.'.$what; + my $symbparm=$symbp{$id}.'.'.$what; my $reslevel= $ENV{'request.course.id'}.'.'.$symbparm; my $seclevel= @@ -51,9 +51,11 @@ sub parmval { # ----------------------------------------------------------- first, check user + if ($uname) { if ($useropt{$reslevel}) { return $useropt{$reslevel}; } if ($useropt{$seclevel}) { return $useropt{$seclevel}; } if ($useropt{$courselevel}) { return $useropt{$courselevel}; } + } # -------------------------------------------------------- second, check course @@ -65,11 +67,10 @@ sub parmval { my $thisparm=$parmhash{$symbparm}; if ($thisparm) { return $thisparm; } - # --------------------------------------------- last, look in resource metadata - my $filename='/home/httpd/res/'.$srcp[$idx].'.meta'; + my $filename='/home/httpd/res/'.$bighash{'src_'.$id}.'.meta'; if (-e $filename) { my @content; { @@ -84,6 +85,16 @@ sub parmval { return ''; } +# ---------------------------------------------------------------- Sort routine + +sub bycat { + if ($fcat eq '') { + $a<=>$b; + } else { + &parmval('0.'.$fcat,$a)<=>&parmval('0.'.$fcat,$b); + } +} + # ================================================================ Main Handler sub handler { @@ -105,21 +116,28 @@ sub handler { %useropt=(); %bighash=(); - @srcp=(); - @typep=(); - @resp=(); - @mapp=(); - @symbp=(); + @ids=(); + %symbp=(); + %typep=(); $uname=$ENV{'form.uname'}; $udom=$ENV{'form.udom'}; unless ($udom) { $uname=''; } $uhome=''; + my $message=''; if ($uname) { $uhome=&Apache::lonnet::homeserver($uname,$udom); } + if ($uhome eq 'no_host') { + $message= + "