version 1.63, 2006/12/18 21:12:51
|
version 1.64, 2006/12/18 21:37:47
|
Line 36 use Apache::response();
|
Line 36 use Apache::response();
|
use Apache::lonlocal; |
use Apache::lonlocal; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint')); |
&Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint')); |
} |
} |
|
|
|
|
Line 269 sub end_mathhint {
|
Line 269 sub end_mathhint {
|
} |
} |
if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') { |
if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') { |
push (@Apache::hint::which,$name); |
push (@Apache::hint::which,$name); |
|
} |
|
$result=''; |
|
} elsif ($target eq 'meta') { |
|
$result=&Apache::response::meta_package_write($token->[1]); |
|
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::end_row().&Apache::edit::end_table(); |
|
} |
|
pop(@Apache::response::custom_answer); |
|
pop(@Apache::response::custom_answer_type); |
|
&Apache::response::end_hintresponse(); |
|
return $result; |
|
} |
|
|
|
sub start_customhint { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
#do everything in end, so intervening <responseparams> and <answer> work |
|
&Apache::response::start_hintresponse($parstack,$safeeval); |
|
&Apache::lonxml::register('Apache::response',('answer')); |
|
my $result; |
|
if ($target eq 'edit') { |
|
$result.=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('Name:','name',$token); |
|
$result.=&Apache::edit::end_row(); |
|
$result.=&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag; |
|
$constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'name'); |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result .= &Apache::edit::handle_insert(); |
|
} elsif ($target eq 'web') { |
|
&Apache::response::reset_params(); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_customhint { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result; |
|
if ($target eq 'web') { |
|
if (!$Apache::lonxml::default_homework_loaded) { |
|
&Apache::lonxml::default_homework_load($safeeval); |
|
} |
|
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); |
|
&Apache::response::setup_params('customhint',$safeeval); |
|
my $partid=$Apache::inputtags::part; |
|
my $submitid=$Apache::inputtags::response[-1]; |
|
my $response = $Apache::lonhomework::history{ |
|
"resource.$partid.$submitid.submission"}; |
|
my $award; |
|
if ( $response =~ /[^\s]/ && |
|
$Apache::response::custom_answer_type[-1] eq 'loncapa/perl') { |
|
if (!$Apache::lonxml::default_homework_loaded) { |
|
&Apache::lonxml::default_homework_load($safeeval); |
|
} |
|
${$safeeval->varglob('LONCAPA::customresponse_submission')}= |
|
$response; |
|
|
|
$award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval); |
|
} |
|
if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') { |
|
push (@Apache::hint::which,$name); |
} |
} |
$result=''; |
$result=''; |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |