version 1.154, 2006/12/11 22:02:13
|
version 1.155, 2006/12/15 21:10:13
|
Line 488 sub start_mathresponse {
|
Line 488 sub start_mathresponse {
|
} |
} |
} elsif ($target eq 'answer' || $target eq 'grade') { |
} elsif ($target eq 'answer' || $target eq 'grade') { |
&Apache::response::reset_params(); |
&Apache::response::reset_params(); |
my $args_ref= \%{$safeeval->varglob('LONCAPA::mathresponse_args')}; |
|
undef(%{ $args_ref }); |
|
$$args_ref{'cas'}=$token->[2]{'cas'}; |
|
if ($token->[2]{'args'}=~/\$/) { |
|
$$args_ref{'args'}=&Apache::run::run($token->[2]{'args'},$safeeval); |
|
} elsif ($token->[2]{'args'}=~/\@/) { |
|
$$args_ref{'args'}=&Apache::run::run('join(",",'.$token->[2]{'args'}.')',$safeeval); |
|
} else { |
|
$$args_ref{'args'}=$token->[2]{'args'}; |
|
} |
|
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result .= &Apache::response::meta_package_write('mathresponse'); |
$result .= &Apache::response::meta_package_write('mathresponse'); |
} |
} |
Line 520 sub end_mathresponse {
|
Line 510 sub end_mathresponse {
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$response; |
$response; |
my $error; |
my $error; |
my $args_ref= \%{$safeeval->varglob('LONCAPA::mathresponse_args')}; |
my $award; |
my $award; |
my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval); |
if ($$args_ref{'cas'} eq 'maxima') { |
if ($cas eq 'maxima') { |
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer,$response,$$args_ref{'args'}); |
my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; |
} |
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer,$response,$args); |
|
} |
if (!&Apache::inputtags::valid_award($award)) { |
if (!&Apache::inputtags::valid_award($award)) { |
$error = $award; |
$error = $award; |
$award = 'ERROR'; |
$award = 'ERROR'; |