--- loncom/interface/lonparmset.pm 2000/12/08 17:16:37 1.19 +++ loncom/interface/lonparmset.pm 2001/01/16 15:52:09 1.21 @@ -9,7 +9,9 @@ # # 10/11,10/12,10/16 Gerd Kortemeyer) # -# 11/20,11/21,11/22,11/23,11/24,11/25,11/27,11/28,12/08 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 Gerd Kortemeyer package Apache::lonparmset; @@ -250,7 +252,7 @@ sub handler { $allkeys{$allkey}=$display; if ($allkey eq $fcat) { $defp{$id}= - &Apache::lonnet::metadata($srcf,$key.'.default'); + &Apache::lonnet::metadata($srcf,$key); } if ($keyp{$id}) { $keyp{$id}.=','.$key; @@ -490,12 +492,14 @@ ENDTABLEHEADFOUR $display{$_}=&Apache::lonnet::metadata($uri,$_.'.display'); unless ($display{$_}) { $display{$_}=''; } $display{$_}.=' ('.$name{$_}.')'; - $default{$_}=&Apache::lonnet::metadata($uri,$_.'.default'); + $default{$_}=&Apache::lonnet::metadata($uri,$_); $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type'); $thistitle=&Apache::lonnet::metadata($uri,$_.'.title'); } split(/\,/,$keyp{$rid}); my $totalparms=scalar keys %name; + my $isdef=1; + unless ($totalparms) { $totalparms=1; $isdef=0; } $r->print(''. join(' / ',split(/\//,$uri)). @@ -510,6 +514,7 @@ ENDTABLEHEADFOUR $r->print(''. join(' / ',split(/\//,$mapp{$rid})).''); + if ($isdef) { map { my $result=&parmval($part{$_}.'.'.$name{$_},$rid,$default{$_}); @@ -574,6 +579,9 @@ ENDTABLEHEADFOUR ''.&valout($outpar[$result],$type{$_}).''); $r->print("\n"); } sort keys %name; + } else { + $r->print("\n"); + } # -------------------------------------------------- End entry for one resource } @ids; $r->print('');