--- loncom/homework/caparesponse/caparesponse.pm 2001/06/29 18:53:50 1.32 +++ loncom/homework/caparesponse/caparesponse.pm 2001/09/18 02:21:13 1.43 @@ -6,7 +6,7 @@ use strict; use capa; sub BEGIN { - &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse')); + &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse')); } sub start_caparesponse { @@ -58,12 +58,30 @@ sub start_numericalresponse { my $result; if ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token)); - $result.=&Apache::edit::text_arg('Answer:','answer',$token). - &Apache::edit::text_arg('Unit:','unit',$token).''; + $result.=&Apache::edit::text_arg('Answer:','answer',$token); + if ($token->[1] eq 'numericalresponse') { + $result.=&Apache::edit::text_arg('Unit:','unit',$token,5); + $result.=&Apache::edit::text_arg('Format:','format',$token,4); + } else { + $result.=&Apache::edit::select_arg('Type:','type', + ['cs','ci','mc'],$token) + } + $result.=''; } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, - 'answer','unit'); - if ($constructtag) { $result = &Apache::edit::rebuild_tag($token);} + my $constructtag; + if ($token->[1] eq 'numericalresponse') { + $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'answer','unit','format'); + } else { + $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'answer','type'); + } + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } + } elsif ($target eq 'meta') { + $result=&Apache::response::meta_package_write('numericalresponse'); } return $result; } @@ -73,56 +91,114 @@ sub end_numericalresponse { my $result = ''; if ( $target eq 'grade' ) { if ( defined $ENV{'form.submitted'}) { + &Apache::response::setup_params('numericalresponse'); $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + my $partid = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my $response = $ENV{'form.HWVAL'.$id}; if ( $response =~ /[^\s]/) { - my $id = $Apache::inputtags::response['-1']; - my $previous= &Apache::response::check_for_previous($response,$id,$response); - if ( $previous ) { - $result = 'PREVIOUSLY_USED'; - } 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=''; + my %previous = &Apache::response::check_for_previous($response,$partid,$id); + $Apache::lonhomework::results{"resource.$partid.$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]; + foreach my $key (keys(%Apache::inputtags::params)) { + $expression.= ';my $'. #' + $key.'="'.$Apache::inputtags::params{$key}.'"'; + } + $expression.="');"; + $result = &Apache::run::run($expression,$safeeval); + my ($awards) = split /:/ , $result; + my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); + if ( $previous{'used'} && ($previous{'award'} eq $ad) ) { + if ($previous{'last'}) { + push(@Apache::inputtags::previous,'PREVIOUSLY_LAST'); + } else { + push(@Apache::inputtags::previous,'PREVIOUSLY_USED'); + } } + $Apache::lonhomework::results{"resource.$partid.$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); - + my $answervar=&Apache::lonxml::get_param('answer',$parstack,$safeeval); + my (@answers)=&Apache::run::run("return $answervar",$safeeval,1); + if (!defined($answers[0])) { $answers[0]=$answervar; } else { + &Apache::lonxml::debug("answers is $#answers :$answers[0]:"); + } + my $formatvar=&Apache::lonxml::get_param('format',$parstack,$safeeval); + my (@formats)=&Apache::run::run("return $formatvar",$safeeval,1); + if (!defined($formats[0])) { $formats[0]=$formatvar; } + + my $unit=&Apache::lonxml::get_param('unit',$parstack,$safeeval); + $result="

The computer got "; - my $answer; - foreach $answer (@answers) { $result.="$answer,"; } + + for (my $i=0; $i <= $#answers; $i++) { + my $answer=$answers[$i]; + my $format; + if ($#formats > 0) { + $format=$formats[$i]; + } else { + $format=$formats[0]; + } + if ((defined($format)) && ($format ne '')) { + &Apache::lonxml::debug("formatting with :$format: answer :$answer:"); + $result.=sprintf('%.'.$format,$answer).','; + } else { + &Apache::lonxml::debug("no format answer :$answer:"); + $result.="$answer,"; + } + } chop $result; $result.=" $unit.

"; } } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; + } elsif ($target eq 'answer') { + my $answer= &Apache::run::run('eval \''.$$parstack[-1].';return $answer\'', + $safeeval); + my (@answers) = &Apache::run::run("eval ".$answer,$safeeval); + # if the eval fails just use what is in the answer exactly + if (!defined(@answers) || !defined($answers[0])) { + $result.="list zero is undefined
"; + $answers[0]=$answer; + } + $result.="
An answers: $answer"; + foreach my $ans (@answers) { + $result.="
An answer: $ans"; + } + $result .= "
".&Apache::run::run('return $result',$safeeval); } &Apache::response::end_response; return $result; } +sub start_stringresponse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('stringresponse'); + } else { + $result.=&start_numericalresponse(@_); + } + return $result; +} + +sub end_stringresponse { + return end_numericalresponse(@_); +} + 1; __END__