';
- } elsif ($target eq 'modified') {
- my $constructtag;
- if ($token->[1] eq 'numericalresponse') {
- $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
- 'answer','unit');
+ foreach my $key (keys(%Apache::inputtags::params)) {
+ $$args_ref{$key}=$Apache::inputtags::params{$key};
+ }
+ &setup_capa_response($args_ref,$response);
+ return $args_ref;
+}
+
+sub setup_capa_response {
+ my ($args_ref,$response) = @_;
+
+ if (ref($response)) {
+ $$args_ref{'response'}=dclone($response);
} else {
- $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
- 'answer','type');
+ $$args_ref{'response'}=dclone([$response]);
+ }
+}
+
+sub check_submission {
+ my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;
+ my @args = ('type','tol','sig','format','unit','calc','samples');
+ my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response);
+
+ my $hideunit=
+ &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
+ #no way to enter units, with radio buttons
+ if ($Apache::lonhomework::type eq 'exam' ||
+ lc($hideunit) eq "yes") {
+ delete($$args_ref{'unit'});
+ }
+ #sig fig don't make much sense either
+ if (($Apache::lonhomework::type eq 'exam' ||
+ &Apache::response::submitted('scantron') ||
+ $ignore_sig) &&
+ $tag eq 'numericalresponse') {
+ delete($$args_ref{'sig'});
+ }
+
+ if ($tag eq 'formularesponse') {
+ if ($$args_ref{'samples'}) {
+ $$args_ref{'type'}='fml';
+ } else {
+ $$args_ref{'type'}='math';
+ }
+ } elsif ($tag eq 'numericalresponse') {
+ $$args_ref{'type'}='float';
}
- if ($constructtag) {
- $result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
+
+ &add_in_tag_answer($parstack,$safeeval);
+
+ if (!%answer) {
+ &Apache::lonxml::error("No answers are defined");
+ }
+
+ my (@final_awards,@final_msgs,@names);
+ foreach my $name (keys(%answer)) {
+ &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
+
+ ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name});
+ &setup_capa_response($args_ref,$response);
+ use Time::HiRes;
+ my $t0 = [Time::HiRes::gettimeofday()];
+ my ($result,@msgs) =
+ &Apache::run::run("&caparesponse_check_list()",$safeeval);
+ &Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0));
+ &Apache::lonxml::debug('msgs are '.join(':',@msgs));
+ my ($awards)=split(/:/,$result);
+ my @awards= split(/,/,$awards);
+ my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
+ push(@final_awards,$ad);
+ push(@final_msgs,$msg);
+ push(@names,$name);
+ }
+ my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,
+ \@final_msgs,
+ \@names,1);
+ &Apache::lonxml::debug(" name of picked award is $name from ".join(', ',@names));
+ return($ad,$msg, $name);
+}
+
+sub add_in_tag_answer {
+ my ($parstack,$safeeval,$response_level) = @_;
+ my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
+ $response_level);
+ &Apache::lonxml::debug('answer is'.join(':',@answer));
+ if (@answer && $answer[0] =~ /\S/) {
+ $answer{$tag_internal_answer_name}= {'type' => 'ordered',
+ 'answers' => [\@answer] };
}
- }
- return $result;
+}
+
+sub capa_formula_fix {
+ my ($expression)=@_;
+ return &Apache::response::implicit_multiplication($expression);
}
sub end_numericalresponse {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result = '';
- if ( $target eq 'grade' ) {
- if ( defined $ENV{'form.submitted'}) {
- $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
- my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
- if ( $response =~ /[^\s]/) {
- my $id = $Apache::inputtags::response['-1'];
- my $previous= &Apache::response::check_for_previous($response,$id,$response);
- if ( $previous ) {
- $result = 'PREVIOUSLY_USED';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+ &Apache::lonxml::deregister('Apache::caparesponse',
+ ('answer','answergroup','value','array','unit',
+ 'vector'));
+ pop(@Apache::lonxml::namespace);
+
+ my $increment=1;
+ my $result = '';
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response[-1];
+ my $tag;
+ my $safehole = new Safe::Hole;
+ $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
+
+ if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
+ if ( $target eq 'grade' && &Apache::response::submitted() ) {
+ &Apache::response::setup_params($tag,$safeeval);
+ if ($Apache::lonhomework::type eq 'exam' &&
+ (($tag eq 'formularesponse') || ($tag eq 'mathresponse'))) {
+ $increment=&Apache::response::scored_response($partid,$id);
} else {
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
- &Apache::lonxml::debug("submitted a $response \n");
- &Apache::lonxml::debug($$parstack[$#$parstack] . "\n ");
- $response =~ s/\\/\\\\/g;
- $response =~ s/\'/\\\'/g;
- &Apache::lonxml::debug("current $response");
- my $expression="&caparesponse_check_list('".$response."','".
- $$parstack[$#$parstack].
- ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
- ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
- "');";
- $result = &Apache::run::run($expression,$safeeval);
- my ($awards) = split /:/ , $result;
- my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
- $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
- &Apache::lonxml::debug("$expression");
- &Apache::lonxml::debug("\n result:$result:$Apache::lonxml::curdepth \n");
- $result='';
- }
- }
- }
- } elsif ($target eq 'web') {
- my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
- my $status = $Apache::inputtags::status['-1'];
- if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
- my $answervar=&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);
- my (@answers)=&Apache::run::run("$answervar",$safeeval);
- my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);
-
- $result=" The computer got ";
- my $answer;
- foreach $answer (@answers) { $result.="$answer,"; }
- chop $result;
- $result.=" $unit. ";
- }
- } elsif ($target eq 'edit') {
- $result.=' |
'.&Apache::edit::end_table;
- }
- &Apache::response::end_response;
- return $result;
+ my $response = &Apache::response::getresponse();
+ if ( $response =~ /[^\s]/) {
+ my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+ &Apache::lonxml::debug("submitted a $response