--- loncom/homework/caparesponse/caparesponse.pm 2000/11/22 00:04:34 1.13 +++ loncom/homework/caparesponse/caparesponse.pm 2001/08/05 16:26:28 1.39 @@ -6,51 +6,175 @@ use strict; use capa; sub BEGIN { - &Apache::lonxml::register('Apache::caparesponse',('caparesponse')); + &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse')); } -$Apache::caparesponse::result=''; sub start_caparesponse { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); - push (@Apache::inputtags::response,$id); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $id = &Apache::response::start_response($parstack,$safeeval); return ''; - #my $envkey; - #foreach $envkey (sort keys %ENV) { - # Apache::lonxml::debug("$envkey ---- $ENV{$envkey}
"); - #} - #Apache::lonxml::debug("\n
\nreal caparesponse
\n"); } sub end_caparesponse { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ( defined $ENV{'form.submit'}) { - $Apache::caparesponse::result=''; - $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::curvalue}; - $Apache::lonhomework::results{"resource.submission.part$Apache::inputtags::part['-1'].response$Apache::inputtags::response['-1']"}=$response; - &Apache::lonxml::debug("submitted a $response
\n"); - &Apache::lonxml::debug($$parstack[$#$parstack] . "\n
"); - my $tol=$Apache::inputtags::{'tol'}; - my $expression="&caparesponse_check('".$response."','". - $$parstack[$#$parstack]. - ';my $tol='.$Apache::inputtags::{'tol'}. - "');"; - $result = &Apache::run::run($expression,$safeeval); - - &Apache::lonxml::debug("\n
result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth
\n"); - - } else { - #return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n"; + 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'; + } else { + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response; + &Apache::lonxml::debug("submitted a $response
\n"); + &Apache::lonxml::debug($$parstack[$#$parstack] . "\n
"); + my $expression="&caparesponse_check('".$response."','". + $$parstack[$#$parstack]. + ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'. + ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'. + "');"; + $result = &Apache::run::run($expression,$safeeval); + my ($ad) = split /:/ , $result; + $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad; + &Apache::lonxml::debug("$expression"); + &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); + } + } + } + } elsif ($target eq 'web') { + #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n"; } #Apache::lonxml::debug("\n
\nreal end caparesponse
\n"); - pop @Apache::inputtags::part; + &Apache::response::end_response; return ''; } +sub start_numericalresponse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $id = &Apache::response::start_response($parstack,$safeeval); + 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); + 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; + 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=&meta_package_write('numericalresponse'); + } + return $result; +} + +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 $partid = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my $response = $ENV{'form.HWVAL'.$id}; + if ( $response =~ /[^\s]/) { + 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]. + ';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); + 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::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 "; + + 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; + } + &Apache::response::end_response; + return $result; +} + +sub start_stringresponse { + return start_numericalresponse(@_); +} + +sub end_stringresponse { + return end_numericalresponse(@_); +} + 1; __END__