--- loncom/homework/caparesponse/caparesponse.pm 2001/08/05 16:26:28 1.39 +++ loncom/homework/caparesponse/caparesponse.pm 2001/08/13 21:44:24 1.42 @@ -81,7 +81,7 @@ sub start_numericalresponse { $result.=&Apache::edit::handle_insert(); } } elsif ($target eq 'meta') { - $result=&meta_package_write('numericalresponse'); + $result=&Apache::response::meta_package_write('numericalresponse'); } return $result; } @@ -91,6 +91,7 @@ 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 $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; @@ -104,10 +105,12 @@ sub end_numericalresponse { $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'}.'"'. - "');"; + $$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); @@ -168,7 +171,14 @@ sub end_numericalresponse { } sub start_stringresponse { - return start_numericalresponse(@_); + 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 {