version 1.156, 2006/12/15 22:11:43
|
version 1.161, 2007/04/07 00:42:29
|
Line 265 sub meta_response_order {
|
Line 265 sub meta_response_order {
|
} |
} |
|
|
sub check_for_previous { |
sub check_for_previous { |
my ($curresponse,$partid,$id) = @_; |
my ($curresponse,$partid,$id,$last) = @_; |
my %previous; |
my %previous; |
$previous{'used'} = 0; |
$previous{'used'} = 0; |
foreach my $key (sort(keys(%Apache::lonhomework::history))) { |
foreach my $key (sort(keys(%Apache::lonhomework::history))) { |
if ($key =~ /resource\.$partid\.$id\.submission$/) { |
if ($key =~ /resource\.$partid\.$id\.submission$/) { |
|
if ( $last && $key =~ /^(\d+):/ ) { |
|
next if ($1 >= $last); |
|
} |
&Apache::lonxml::debug("Trying $key"); |
&Apache::lonxml::debug("Trying $key"); |
my $pastresponse=$Apache::lonhomework::history{$key}; |
my $pastresponse=$Apache::lonhomework::history{$key}; |
if ($pastresponse eq $curresponse) { |
if ($pastresponse eq $curresponse) { |
Line 368 sub start_customresponse {
|
Line 371 sub start_customresponse {
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
push(@Apache::lonxml::namespace,'customresponse'); |
push(@Apache::lonxml::namespace,'customresponse'); |
my $result; |
my $result; |
undef($Apache::response::custom_answer); |
@Apache::response::custom_answer=(); |
|
@Apache::response::custom_answer_type=(); |
&Apache::lonxml::register('Apache::response',('answer')); |
&Apache::lonxml::register('Apache::response',('answer')); |
if ($target eq 'web') { |
if ($target eq 'web') { |
if ( &Apache::response::show_answer() ) { |
if ( &Apache::response::show_answer() ) { |
Line 408 sub end_customresponse {
|
Line 412 sub end_customresponse {
|
&Apache::response::submitted('scantron')) { |
&Apache::response::submitted('scantron')) { |
&Apache::response::scored_response($part,$id); |
&Apache::response::scored_response($part,$id); |
} elsif ( $response =~ /[^\s]/ && |
} elsif ( $response =~ /[^\s]/ && |
$Apache::response::custom_answer_type eq 'loncapa/perl') { |
$Apache::response::custom_answer_type[-1] 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 420 sub end_customresponse {
|
Line 424 sub end_customresponse {
|
${$safeeval->varglob('LONCAPA::customresponse_submission')}= |
${$safeeval->varglob('LONCAPA::customresponse_submission')}= |
$response; |
$response; |
|
|
my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval); |
my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer[-1].'}',$safeeval); |
if (!&Apache::inputtags::valid_award($award)) { |
if (!&Apache::inputtags::valid_award($award)) { |
$error = $award; |
$error = $award; |
$award = 'ERROR'; |
$award = 'ERROR'; |
Line 448 sub end_customresponse {
|
Line 452 sub end_customresponse {
|
&Apache::lonxml::increment_counter(&Apache::response::repetition()); |
&Apache::lonxml::increment_counter(&Apache::response::repetition()); |
} |
} |
pop(@Apache::lonxml::namespace); |
pop(@Apache::lonxml::namespace); |
|
pop(@Apache::response::custom_answer); |
|
pop(@Apache::response::custom_answer_type); |
&Apache::lonxml::deregister('Apache::response',('answer')); |
&Apache::lonxml::deregister('Apache::response',('answer')); |
&Apache::response::end_response(); |
&Apache::response::end_response(); |
return $result; |
return $result; |
Line 459 sub start_mathresponse {
|
Line 465 sub start_mathresponse {
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
push(@Apache::lonxml::namespace,'mathresponse'); |
push(@Apache::lonxml::namespace,'mathresponse'); |
my $result; |
my $result; |
undef($Apache::response::custom_answer); |
@Apache::response::custom_answer=(); |
|
@Apache::response::custom_answer_type=(); |
&Apache::lonxml::register('Apache::response',('answer')); |
&Apache::lonxml::register('Apache::response',('answer')); |
if ($target eq 'web') { |
if ($target eq 'web') { |
if ( &Apache::response::show_answer() ) { |
if ( &Apache::response::show_answer() ) { |
Line 514 sub end_mathresponse {
|
Line 521 sub end_mathresponse {
|
my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval); |
my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval); |
if ($cas eq 'maxima') { |
if ($cas eq 'maxima') { |
my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; |
my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; |
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer,$response,$args); |
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args); |
} |
} |
if (!&Apache::inputtags::valid_award($award)) { |
if (!&Apache::inputtags::valid_award($award)) { |
$error = $award; |
$error = $award; |
Line 530 sub end_mathresponse {
|
Line 537 sub end_mathresponse {
|
} |
} |
} |
} |
pop(@Apache::lonxml::namespace); |
pop(@Apache::lonxml::namespace); |
|
pop(@Apache::response::custom_answer); |
|
pop(@Apache::response::custom_answer_type); |
&Apache::lonxml::deregister('Apache::response',('answer')); |
&Apache::lonxml::deregister('Apache::response',('answer')); |
&Apache::response::end_response(); |
&Apache::response::end_response(); |
return $result; |
return $result; |
Line 561 sub implicit_multiplication {
|
Line 570 sub implicit_multiplication {
|
sub start_answer { |
sub start_answer { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
$Apache::response::custom_answer= |
push(@Apache::response::custom_answer, |
&Apache::lonxml::get_all_text_unbalanced("/answer",$parser); |
&Apache::lonxml::get_all_text_unbalanced("/answer",$parser)); |
$Apache::response::custom_answer_type= |
push(@Apache::response::custom_answer_type, |
lc(&Apache::lonxml::get_param('type',$parstack,$safeeval)); |
lc(&Apache::lonxml::get_param('type',$parstack,$safeeval))); |
$Apache::response::custom_answer_type =~ s/\s+//g; |
$Apache::response::custom_answer_type[-1] =~ s/\s+//g; |
if ($target eq "edit" ) { |
if ($target eq "edit" ) { |
$result=&Apache::edit::tag_start($target,$token,'Answer algorithm'); |
$result=&Apache::edit::tag_start($target,$token,'Answer algorithm'); |
$result.=&Apache::edit::editfield($token->[1], |
$result.=&Apache::edit::editfield($token->[1], |
$Apache::response::custom_answer, |
$Apache::response::custom_answer[-1], |
'',80,4); |
'',80,4); |
} elsif ( $target eq "modified" ) { |
} elsif ( $target eq "modified" ) { |
$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser); |
Line 688 sub setup_params {
|
Line 697 sub setup_params {
|
if ($env{'request.state'} eq 'construct') { return; } |
if ($env{'request.state'} eq 'construct') { return; } |
my %paramlist=(); |
my %paramlist=(); |
foreach my $key (keys(%Apache::lonnet::packagetab)) { |
foreach my $key (keys(%Apache::lonnet::packagetab)) { |
if ($key =~ /^$tag/) { |
if ($key =~ /^\Q$tag\E/) { |
my ($package,$name) = split(/&/,$key); |
my ($package,$name) = split(/&/,$key); |
$paramlist{$name}=1; |
$paramlist{$name}=1; |
} |
} |
Line 1020 sub submitted {
|
Line 1029 sub submitted {
|
if ($who eq 'scantron') { return 0; } |
if ($who eq 'scantron') { return 0; } |
# if the Submit Answer button for this particular part was pressed |
# if the Submit Answer button for this particular part was pressed |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
if (defined($env{'form.submit_'.$partid})) { return 1; } |
if ($env{'form.submitted'} eq "part_$partid") { |
|
return 1; |
|
} |
|
if ($env{'form.submitted'} eq "yes" |
|
&& defined($env{'form.submit_'.$partid})) { |
|
return 1; |
|
} |
# Submit All button on a .page was pressed |
# Submit All button on a .page was pressed |
if (defined($env{'form.all_submit'})) { return 1; } |
if (defined($env{'form.all_submit'})) { return 1; } |
# otherwise no submission occured |
# otherwise no submission occured |