version 1.142, 2006/06/28 21:12:50
|
version 1.182, 2007/11/05 11:46:08
|
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 264 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 306 sub handle_previous {
|
Line 310 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 344 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 367 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() ) { |
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 386 sub start_customresponse {
|
Line 391 sub start_customresponse {
|
$safeeval,'answerdisplay'); |
$safeeval,'answerdisplay'); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$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(); |
Line 403 sub end_customresponse {
|
Line 407 sub end_customresponse {
|
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 ($Apache::lonhomework::type eq 'exam' || |
$Apache::response::custom_answer_type eq 'loncapa/perl') { |
&Apache::response::submitted('scantron')) { |
|
&Apache::response::scored_response($part,$id); |
|
} elsif ( $response =~ /[^\s]/ && |
|
$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 416 sub end_customresponse {
|
Line 423 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 429 sub end_customresponse {
|
Line 436 sub end_customresponse {
|
$error; |
$error; |
} |
} |
} |
} |
|
} elsif ( $target eq 'answer') { |
|
$result = &Apache::response::answer_header('customresponse'); |
|
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack, |
|
$safeeval); |
|
if ($env{'form.answer_output_mode'} ne 'tex') { |
|
$answer = '<b>'.$answer.'</b>'; |
|
} |
|
$result .= &Apache::response::answer_part('customresponse',$answer); |
|
$result .= &Apache::response::answer_footer('customresponse'); |
|
} |
|
if ($target eq 'web') { |
|
&setup_prior_tries_hash(\&format_prior_response_math); |
|
} |
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
&Apache::lonxml::increment_counter(&Apache::response::repetition(), |
|
"$part.$id"); |
|
if ($target eq 'analyze') { |
|
&Apache::lonhomework::set_bubble_lines(); |
|
} |
} |
} |
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; |
} |
} |
|
|
|
sub format_prior_response_custom { |
|
my ($mode,$answer) =@_; |
|
return '<span class="LC_prior_custom">'. |
|
&HTML::Entities::encode($answer,'"<>&').'</span>'; |
|
} |
|
|
sub start_mathresponse { |
sub start_mathresponse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
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() ) { |
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(); |
|
} |
} |
} elsif ($target eq 'answer' || $target eq 'grade') { |
} elsif ($target eq 'answer' || $target eq 'grade') { |
&Apache::response::reset_params(); |
&Apache::response::reset_params(); |
Line 478 sub end_mathresponse {
|
Line 518 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 488 sub end_mathresponse {
|
Line 527 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 $award; |
$response; |
my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval); |
|
if ($cas eq 'maxima') { |
my $award = &Apache::run::run('{ my $submission=$LONCAPA::mathresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval); |
my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; |
|
$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; |
$award = 'ERROR'; |
$award = 'ERROR'; |
Line 505 sub end_mathresponse {
|
Line 546 sub end_mathresponse {
|
} |
} |
} |
} |
} |
} |
|
if ($target eq 'web') { |
|
&setup_prior_tries_hash(\&format_prior_response_math); |
|
} |
|
|
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; |
} |
} |
|
|
|
sub format_prior_response_math { |
|
my ($mode,$answer) =@_; |
|
return '<span class="LC_prior_math">'. |
|
&HTML::Entities::encode($answer,'"<>&').'</span>'; |
|
} |
|
|
|
sub implicit_multiplication { |
|
my ($expression)=@_; |
|
# Escape scientific notation, so 3e8 does not become 3*e*8 |
|
# 3e8 -> 3&8; 3e-8 -> 3&-8; 3E+8 -> e&+8 |
|
$expression=~s/(\d+)e([\+\-]*\d+)/$1\&\($2\)/gsi; |
|
# 3x10^8 -> 3&8; 3*10^-8 -> 3&-8 |
|
$expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi; |
|
# Fill in multiplication signs |
|
# a b -> a*b;3 b -> 3*b;3 4 -> 3*4 |
|
$expression=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs; |
|
# )( -> )*(; ) ( -> )*( |
|
$expression=~s/\)\s*\(/\)\*\(/gs; |
|
# 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A |
|
$expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs; |
|
# a ( -> a*( |
|
$expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs; |
|
# )a -> )*a; )3 -> )*3; ) 3 -> )*3 |
|
$expression=~s/\)\s*([A-Za-z0-9])/\)\*$1/gs; |
|
# 3&8 -> 3e8; 3&-4 -> 3e-4 |
|
$expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs; |
|
return $expression; |
|
} |
|
|
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 604 sub start_responseparam {
|
Line 679 sub start_responseparam {
|
} |
} |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.=&Apache::edit::handle_insert(); |
|
} |
} |
} elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' || |
} elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' || |
$target eq 'tex' || $target eq 'analyze' ) { |
$target eq 'tex' || $target eq 'analyze' ) { |
Line 642 sub setup_params {
|
Line 716 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 670 sub setup_params {
|
Line 744 sub setup_params {
|
|
|
{ |
{ |
my @answer_bits; |
my @answer_bits; |
|
my $need_row_start; |
|
|
sub answer_header { |
sub answer_header { |
my ($type,$increment) = @_; |
my ($type,$increment,$rows) = @_; |
my $result; |
my $result; |
if ($env{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
undef(@answer_bits); |
undef(@answer_bits); |
Line 685 sub answer_header {
|
Line 760 sub answer_header {
|
} |
} |
push(@answer_bits,$bit); |
push(@answer_bits,$bit); |
} else { |
} else { |
|
my $td = '<td '.(defined($rows)?'rowspan="'.$rows.'"':'').'>'; |
$result = '<table border="1"><tr>'; |
$result = '<table border="1"><tr>'; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result .= '<td>'.($Apache::lonxml::counter+$increment). ')</td>'; |
$result .= $td.($Apache::lonxml::counter+$increment). ')</td>'; |
} else { |
} else { |
$result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>'; |
$result .= $td.&mt('Answer for Part: [_1]', |
|
$Apache::inputtags::part).'</td>'; |
} |
} |
$result .= "\n"; |
$result .= "\n"; |
|
$need_row_start = 0; |
|
} |
|
return $result; |
|
} |
|
|
|
sub next_answer { |
|
my ($type) = @_; |
|
my $result; |
|
if ($env{'form.answer_output_mode'} eq 'tex') { |
|
# FIXME ... need to do something with tex mode |
|
} else { |
|
$result .= "</tr>"; |
|
$need_row_start = 1; |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub answer_part { |
sub answer_part { |
my ($type,$answer) = @_; |
my ($type,$answer,$args) = @_; |
my $result; |
my $result; |
if ($env{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
my $to_use='|'; |
if (!$args->{'no_verbatim'}) { |
foreach my $value (32..126) { |
my $to_use='|'; |
my $char=pack('c',$value); |
foreach my $value (32..126) { |
if ($answer !~ /\Q$char\E/) { |
my $char=pack('c',$value); |
$to_use=$char; |
if ($answer !~ /\Q$char\E/) { |
last; |
$to_use=$char; |
|
last; |
|
} |
|
} |
|
if ($answer ne '') { |
|
$answer = '\verb'.$to_use.$answer.$to_use; |
} |
} |
} |
} |
if ($answer ne '') { |
if ($answer ne '') { |
push(@answer_bits,'\verb'.$to_use.$answer.$to_use); |
push(@answer_bits,$answer); |
} |
} |
} else { |
} else { |
$result = '<td>'.$answer.'</td>'; |
if ($need_row_start) { |
|
$result .= '<tr>'; |
|
$need_row_start = 0; |
|
} |
|
$result .= '<td>'.$answer.'</td>'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 735 sub answer_footer {
|
Line 834 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 746 sub showallfoils {
|
Line 845 sub showallfoils {
|
return 0; |
return 0; |
} |
} |
|
|
|
=pod |
|
|
|
=item &getresponse($offset,$resulttype); |
|
|
|
Retreives the current submitted response, helps out in the case of |
|
scantron mode. |
|
|
|
Returns either the exact text of the submission, or a bubbled response |
|
converted to something usable. |
|
|
|
Optional Arguments: |
|
$offset - (defaults to 1) if a problem has more than one bubble |
|
response, pass in the number of the bubble wanted, (the |
|
first bubble associated with a problem has an offset of 1, |
|
the second bubble is 2 |
|
|
|
$resulttype - undef -> a number between 0 and 25 |
|
'A is 1' -> a number between 1 and 26 |
|
'letter' -> a letter between 'A' and 'Z' |
|
$lines - undef problem only needs a single line of bubbles. |
|
nonzero Problem wants the first nonempty response in |
|
$lines lines of bubbles. |
|
$bubbles_per_line - Must be provided if lines is defined.. number of |
|
bubbles on a line. |
|
|
|
=cut |
|
|
sub getresponse { |
sub getresponse { |
my ($temp,$resulttype)=@_; |
my ($offset,$resulttype, $lines, $bubbles_per_line)=@_; |
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1']; |
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1']; |
my $response; |
my $response; |
if (!defined($temp)) { |
if (!defined($offset)) { |
$temp=1; |
$offset=1; |
} else { |
} else { |
$formparm.=":$temp"; |
$formparm.=":$offset"; |
} |
} |
|
if (!defined($lines)) { |
|
$lines = 1; |
|
} |
|
|
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, |
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, |
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, |
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, |
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, |
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, |
Line 762 sub getresponse {
|
Line 892 sub getresponse {
|
if ($env{'form.submitted'} eq 'scantron') { |
if ($env{'form.submitted'} eq 'scantron') { |
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $id = $Apache::inputtags::response[-1]; |
my $id = $Apache::inputtags::response[-1]; |
$response = $env{'scantron.'.($Apache::lonxml::counter+$temp-1). |
|
'.answer'}; |
my $line; |
|
for ($line = 0; $line < $lines; $line++) { |
|
$response = $env{'scantron.'. |
|
($Apache::lonxml::counter+$offset-1+$line). |
|
'.answer'}; |
|
if ((defined($response)) && ($response ne " ")) { |
|
last; |
|
} |
|
|
|
} |
|
|
# save bubbled letter for later |
# save bubbled letter for later |
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
$response; |
$response; |
|
|
if ($resulttype ne 'letter') { |
if ($resulttype ne 'letter') { |
if ($resulttype eq 'A is 1') { |
if ($resulttype eq 'A is 1') { |
$response = $let_to_num{$response}+1; |
$response = $let_to_num{$response}+1; |
} else { |
} else { |
$response = $let_to_num{$response}; |
$response = $let_to_num{$response}; |
} |
} |
|
if ($response ne "") { |
|
$response += $line * $bubbles_per_line; |
|
} |
|
} else { |
|
if ($response ne "") { |
|
$response = chr(ord($response) + $line * $bubbles_per_line); |
|
} |
} |
} |
|
|
} else { |
} else { |
$response = $env{$formparm}; |
$response = $env{$formparm}; |
} |
} |
|
# |
|
# If we have a nonempty answer, correct the numeric value |
|
# of the answer for the line on which it was found. |
|
# |
|
|
return $response; |
return $response; |
} |
} |
|
|
|
=pod |
|
|
|
=item &repetition(); |
|
|
|
Returns the number of lines that are required to encode the weight. |
|
(Currently expects that there are 10 bubbles per line) |
|
|
|
=cut |
|
|
sub repetition { |
sub repetition { |
my $id = $Apache::inputtags::part; |
my $id = $Apache::inputtags::part; |
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
Line 789 sub repetition {
|
Line 952 sub repetition {
|
return $repetition; |
return $repetition; |
} |
} |
|
|
|
=pod |
|
|
|
=item &scored_response($part_id,$response_id); |
|
|
|
Sets the results hash elements |
|
|
|
resource.$part_id.$response_id.awarded - to the floating point |
|
number between 0 and 1 that was awarded on the bubbled input |
|
|
|
resource.$part_id.$response_id.awarddetail - to 'ASSIGNED_SCORE' |
|
|
|
Returns |
|
|
|
the number of bubble sheet lines that were used (and likely need to |
|
be passed to &Apache::lonxml::increment_counter() |
|
|
|
Arguments |
|
|
|
$part_id - id of the part to grade |
|
$response_id - id of the response to grade |
|
|
|
|
|
=cut |
|
|
sub scored_response { |
sub scored_response { |
my ($part,$id)=@_; |
my ($part,$id)=@_; |
my $repetition=&repetition(); |
my $repetition=&repetition(); |
Line 863 sub show_answer {
|
Line 1050 sub show_answer {
|
my $award = $Apache::lonhomework::history{"resource.$part.solved"}; |
my $award = $Apache::lonhomework::history{"resource.$part.solved"}; |
my $status = $Apache::inputtags::status[-1]; |
my $status = $Apache::inputtags::status[-1]; |
return ( ($award =~ /^correct/ |
return ( ($award =~ /^correct/ |
&& lc($Apache::lonhomework::problemstatus) ne 'no') |
&& &Apache::lonhomework::show_problem_status()) |
|| $status eq "SHOW_ANSWER"); |
|| $status eq "SHOW_ANSWER"); |
} |
} |
|
|
Line 924 sub pick_foil_for_concept {
|
Line 1111 sub pick_foil_for_concept {
|
$Apache::response::conceptgroup{'names'}; |
$Apache::response::conceptgroup{'names'}; |
|
|
} |
} |
|
#------------------------------------------------------------ |
|
# |
|
# Get a parameter associated with a problem. |
|
# Parameters: |
|
# $id - the id of the paramater, either a part id, |
|
# or a partid and responspe id joined by _ |
|
# $name - Name of the parameter to fetch |
|
# $default - Default value for the paramter. |
|
# |
|
# |
|
# |
sub get_response_param { |
sub get_response_param { |
my ($id,$name,$default)=@_; |
my ($id,$name,$default)=@_; |
my $parameter; |
my $parameter; |
Line 949 sub submitted {
|
Line 1146 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 |
Line 957 sub submitted {
|
Line 1160 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' |
Line 989 sub add_to_gradingqueue {
|
Line 1192 sub add_to_gradingqueue {
|
# a return of 3 means it after the answer date |
# a return of 3 means it after the answer date |
sub check_status { |
sub check_status { |
my ($id)=@_; |
my ($id)=@_; |
if (!$id) { $id=$Apache::linputtags::part; } |
if (!defined($id)) { $id=$Apache::inputtags::part; } |
my $curtime=&Apache::lonnet::EXT('system.time'); |
my $curtime=&Apache::lonnet::EXT('system.time'); |
my $opendate=&Apache::lonnet::EXT("resource.$id.opendate"); |
my $opendate=&Apache::lonnet::EXT("resource.$id.opendate"); |
my $duedate=&Apache::lonnet::EXT("resource.$id.duedate"); |
my $duedate=&Apache::lonnet::EXT("resource.$id.duedate"); |
Line 1009 sub check_status {
|
Line 1212 sub check_status {
|
return 2; |
return 2; |
} |
} |
|
|
|
=pod |
|
|
|
=item setup_prior_tries_hash($func,$data) |
|
|
|
Foreach each past .submission $func is called with 3 arguments |
|
- the mode to set things up for (currently always 'grade') |
|
- the stored .submission string |
|
- The expansion of $data |
|
|
|
$data is an array ref containing elements that are either |
|
- scalars that are other elements of the history hash to pass to $func |
|
- ref to data to be passed untouched to $func |
|
|
|
=cut |
|
|
|
sub setup_prior_tries_hash { |
|
my ($func,$data) = @_; |
|
my $part = $Apache::inputtags::part; |
|
my $id = $Apache::inputtags::response[-1]; |
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
|
my $sub_key = "$i:resource.$part.$id.submission"; |
|
next if (!exists($Apache::lonhomework::history{$sub_key})); |
|
my @other_data; |
|
foreach my $datum (@{ $data }) { |
|
if (ref($datum)) { |
|
push(@other_data,$datum); |
|
} else { |
|
my $info_key = "$i:resource.$part.$id.$datum"; |
|
push(@other_data,$Apache::lonhomework::history{$info_key}); |
|
} |
|
} |
|
|
|
my $output = |
|
&$func('grade', |
|
$Apache::lonhomework::history{$sub_key}, |
|
\@other_data); |
|
if (defined($output)) { |
|
$Apache::inputtags::submission_display{$sub_key} = $output; |
|
} |
|
} |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|