version 1.148, 2006/10/17 17:09:44
|
version 1.154, 2006/12/11 22:02:13
|
Line 30 package Apache::response;
|
Line 30 package Apache::response;
|
use strict; |
use strict; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::lonmaxima(); |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse')); |
&Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse')); |
Line 306 sub handle_previous {
|
Line 307 sub handle_previous {
|
} |
} |
|
|
sub view_or_modify { |
sub view_or_modify { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser(); |
my $myself=0; |
my $myself=0; |
if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) { |
if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) { |
$myself=1; |
$myself=1; |
Line 340 sub end_dataresponse {
|
Line 341 sub end_dataresponse {
|
if ( $target eq 'web' ) { |
if ( $target eq 'web' ) { |
} elsif ($target eq 'grade' ) { |
} elsif ($target eq 'grade' ) { |
if ( defined $env{'form.submitted'}) { |
if ( defined $env{'form.submitted'}) { |
my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name)=&Apache::lonnet::whichuser(); |
my $allowed=&Apache::lonnet::allowed('mgr',$courseid); |
my $allowed=&Apache::lonnet::allowed('mgr',$courseid); |
if ($allowed) { |
if ($allowed) { |
&Apache::response::setup_params('dataresponse',$safeeval); |
&Apache::response::setup_params('dataresponse',$safeeval); |
Line 373 sub start_customresponse {
|
Line 374 sub start_customresponse {
|
if ( &Apache::response::show_answer() ) { |
if ( &Apache::response::show_answer() ) { |
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack, |
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack, |
$safeeval); |
$safeeval); |
$Apache::inputtags::answertxt{$id}=$answer; |
$Apache::inputtags::answertxt{$id}=[$answer]; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
Line 464 sub start_mathresponse {
|
Line 465 sub start_mathresponse {
|
if ( &Apache::response::show_answer() ) { |
if ( &Apache::response::show_answer() ) { |
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack, |
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack, |
$safeeval); |
$safeeval); |
$Apache::inputtags::answertxt{$id}=$answer; |
$Apache::inputtags::answertxt{$id}=[$answer]; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('String to display for answer:', |
$result.=&Apache::edit::text_arg('String to display for answer:', |
'answerdisplay',$token); |
'answerdisplay',$token); |
|
$result.=&Apache::edit::select_arg('Algebra System:', |
|
'cas', |
|
['maxima'], |
|
$token); |
|
$result.=&Apache::edit::text_arg('Argument Array:', |
|
'args',$token); |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag; |
my $constructtag; |
$constructtag=&Apache::edit::get_new_args($token,$parstack, |
$constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'answerdisplay'); |
$safeeval,'answerdisplay','cas','args'); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::handle_insert(); |
$result.=&Apache::edit::handle_insert(); |
} |
} |
} 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 494 sub end_mathresponse {
|
Line 511 sub end_mathresponse {
|
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
if ( $target eq 'grade' && &Apache::response::submitted() ) { |
if ( $target eq 'grade' && &Apache::response::submitted() ) { |
my $response = &Apache::response::getresponse(); |
my $response = &Apache::response::getresponse(); |
if ( $response =~ /[^\s]/ && |
if ( $response =~ /[^\s]/ ) { |
$Apache::response::custom_answer_type eq 'loncapa/perl') { |
|
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
} |
} |
Line 504 sub end_mathresponse {
|
Line 520 sub end_mathresponse {
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$response; |
$response; |
my $error; |
my $error; |
${$safeeval->varglob('LONCAPA::mathresponse_submission')}= |
my $args_ref= \%{$safeeval->varglob('LONCAPA::mathresponse_args')}; |
$response; |
my $award; |
|
if ($$args_ref{'cas'} eq 'maxima') { |
my $award = &Apache::run::run('{ my $submission=$LONCAPA::mathresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval); |
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer,$response,$$args_ref{'args'}); |
|
} |
if (!&Apache::inputtags::valid_award($award)) { |
if (!&Apache::inputtags::valid_award($award)) { |
$error = $award; |
$error = $award; |
$award = 'ERROR'; |
$award = 'ERROR'; |
Line 776 sub answer_footer {
|
Line 793 sub answer_footer {
|
|
|
sub showallfoils { |
sub showallfoils { |
if (defined($env{'form.showallfoils'})) { |
if (defined($env{'form.showallfoils'})) { |
my ($symb)=&Apache::lonxml::whichuser(); |
my ($symb)=&Apache::lonnet::whichuser(); |
if (($env{'request.state'} eq 'construct') || |
if (($env{'request.state'} eq 'construct') || |
($env{'user.adv'} && $symb eq '') || |
($env{'user.adv'} && $symb eq '') || |
($Apache::lonhomework::viewgrades) ) { |
($Apache::lonhomework::viewgrades) ) { |
Line 998 sub submitted {
|
Line 1015 sub submitted {
|
} |
} |
|
|
sub add_to_gradingqueue { |
sub add_to_gradingqueue { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser(); |
if ( $courseid eq '' |
if ( $courseid eq '' |
|| $symb eq '' |
|| $symb eq '' |
|| $env{'request.state'} eq 'construct' |
|| $env{'request.state'} eq 'construct' |