--- loncom/interface/lonparmset.pm 2002/10/01 07:09:05 1.71
+++ loncom/interface/lonparmset.pm 2002/10/04 05:51:28 1.73
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.71 2002/10/01 07:09:05 albertel Exp $
+# $Id: lonparmset.pm,v 1.73 2002/10/04 05:51:28 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -467,6 +467,7 @@ sub print_row {
# '.'.$$name{$which}.'.type',$symbp{$rid});
# this seems to work
my $sessionvaltype=$typeoutpar[$result];
+ if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
$r->print('
'.
&valout($sessionval,$sessionvaltype).' '.
' | ');
@@ -1195,7 +1196,7 @@ ENDTABLEHEADFOUR
foreach (split(/\,/,$keyp{$rid})) {
my $tempkeyp = $_;
my $fullkeyp = $tempkeyp;
- $tempkeyp =~ s/_[\d_]+_/_0_/;
+ $tempkeyp =~ s/_\w+_/_0_/;
if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";
@@ -1203,7 +1204,7 @@ ENDTABLEHEADFOUR
$display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
- $display{$tempkeyp} =~ s/_[\d_]+_/_0_/;
+ $display{$tempkeyp} =~ s/_\w+_/_0_/;
$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
}
@@ -1277,14 +1278,14 @@ ENDMAPONE
foreach (split(/\,/,$keyp{$rid})) {
my $tempkeyp = $_;
my $fullkeyp = $tempkeyp;
- $tempkeyp =~ s/_[\d_]+_/_0_/;
+ $tempkeyp =~ s/_\w+_/_0_/;
if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
$display{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
- $display{$tempkeyp} =~ s/_[\d_]+_/_0_/;
+ $display{$tempkeyp} =~ s/_\w+_/_0_/;
$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
}