--- loncom/interface/lonparmset.pm 2000/11/25 19:57:17 1.12 +++ loncom/interface/lonparmset.pm 2001/02/08 12:36:57 1.22 @@ -9,7 +9,9 @@ # # 10/11,10/12,10/16 Gerd Kortemeyer) # -# 11/20,11/21,11/22,11/23,11/24,11/25 Gerd Kortemeyer +# 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28, +# 12/08,12/12, +# 16/01/01,02/08 Gerd Kortemeyer package Apache::lonparmset; @@ -17,7 +19,6 @@ use strict; use Apache::lonnet; use Apache::Constants qw(:common :http REDIRECT); use GDBM_File; -use Apache::lonmeta; my %courseopt; @@ -31,6 +32,10 @@ my @ids; my %symbp; my %mapp; my %typep; +my %keyp; +my %defp; + +my %allkeys; my $uname; my $udom; @@ -53,13 +58,13 @@ sub parmval { my $seclevel= $ENV{'request.course.id'}.'.['. - $ENV{'request.course.sec'}.'].'.$what; + $csec.'].'.$what; my $seclevelr= $ENV{'request.course.id'}.'.['. - $ENV{'request.course.sec'}.'].'.$symbparm; + $csec.'].'.$symbparm; my $seclevelm= $ENV{'request.course.id'}.'.['. - $ENV{'request.course.sec'}.'].'.$mapparm; + $csec.'].'.$mapparm; my $courselevel= $ENV{'request.course.id'}.'.'.$what; @@ -121,16 +126,6 @@ sub parmval { return $result; } -# ---------------------------------------------------------------- Sort routine - -sub bycat { - if ($fcat eq '') { - $a<=>$b; - } else { - &parmval('0.'.$fcat,$a)<=>&parmval('0.'.$fcat,$b); - } -} - # ------------------------------------------------------------ Output for value sub valout { @@ -145,7 +140,7 @@ sub plink { my ($type,$dis,$value,$marker,$return,$call)=@_; return ''. - &valout($value,$type).''; + &valout($value,$type).''; } # ================================================================ Main Handler @@ -177,6 +172,8 @@ sub handler { $csec=$ENV{'form.csec'}; $udom=$ENV{'form.udom'}; + unless ($udom) { $udom=$r->dir_config('lonDefDomain'); } + my $id=$ENV{'form.id'}; if (($id) && ($udom)) { $uname=(&Apache::lonnet::idget($udom,$id))[1]; @@ -184,7 +181,7 @@ sub handler { $id=''; } else { $message= - "
Sort list by '); + + $r->print('
Sort list by '); $r->print(''); # ----------------------------------------------------------------- Start Table my $coursespan=$csec?8:5; @@ -352,82 +463,126 @@ ENDTABLEHEADFOUR $r->print('
'. + my $isdef=1; + unless ($totalparms) { $totalparms=1; $isdef=0; } + $r->print('
'. $bighash{'title_'.$rid}); if ($thistitle) { $r->print(' ('.$thistitle.')'); } $r->print('