version 1.227.2.1, 2008/09/12 10:09:18
|
version 1.227.2.2, 2008/09/13 02:46:59
|
Line 447 sub check_submission {
|
Line 447 sub check_submission {
|
} |
} |
} elsif ($tag eq 'numericalresponse') { |
} elsif ($tag eq 'numericalresponse') { |
$$args_ref{'type'}='float'; |
$$args_ref{'type'}='float'; |
|
} elsif ($tag eq 'stringresponse') { |
|
if ($$args_ref{'type'} eq '') { |
|
$$args_ref{'type'} = 'ci'; |
|
} |
} |
} |
|
|
&add_in_tag_answer($parstack,$safeeval); |
&add_in_tag_answer($parstack,$safeeval); |
|
|
if (!%answer) { |
if (!%answer) { |
Line 464 sub check_submission {
|
Line 468 sub check_submission {
|
use Time::HiRes; |
use Time::HiRes; |
my $t0 = [Time::HiRes::gettimeofday()]; |
my $t0 = [Time::HiRes::gettimeofday()]; |
my ($result,@msgs) = |
my ($result,@msgs) = |
&Apache::run::run("&caparesponse_check_list($tag)",$safeeval); |
&Apache::run::run("&caparesponse_check_list()",$safeeval); |
&Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0)); |
&Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0)); |
&Apache::lonxml::debug('msgs are '.join(':',@msgs)); |
&Apache::lonxml::debug('msgs are '.join(':',@msgs)); |
my ($awards)=split(/:/,$result); |
my ($awards)=split(/:/,$result); |
Line 1171 sub end_stringresponse {
|
Line 1175 sub end_stringresponse {
|
my @args = ('type'); |
my @args = ('type'); |
my $args_ref = &setup_capa_args($safeeval,$parstack, |
my $args_ref = &setup_capa_args($safeeval,$parstack, |
\@args,$response); |
\@args,$response); |
|
if ($$args_ref{'type'} eq '') { |
|
$$args_ref{'type'} = 'ci'; |
|
} |
&add_in_tag_answer($parstack,$safeeval); |
&add_in_tag_answer($parstack,$safeeval); |
my (@final_awards,@final_msgs,@names); |
my (@final_awards,@final_msgs,@names); |
foreach my $name (keys(%answer)) { |
foreach my $name (keys(%answer)) { |
&Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} })); |
&Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} })); |
${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name}); |
${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name}); |
my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list($$tagstack[-1])",$safeeval); |
my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); |
&Apache::lonxml::debug('msgs are'.join(':',@msgs)); |
&Apache::lonxml::debug('msgs are'.join(':',@msgs)); |
my ($awards)=split(/:/,$result); |
my ($awards)=split(/:/,$result); |
my (@awards) = split(/,/,$awards); |
my (@awards) = split(/,/,$awards); |