version 1.108, 2004/10/21 06:33:37
|
version 1.146, 2006/08/01 14:41:46
|
Line 29
|
Line 29
|
package Apache::response; |
package Apache::response; |
use strict; |
use strict; |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use Apache::lonnet; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse')); |
&Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse')); |
} |
} |
|
|
sub start_response { |
sub start_response { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id = &Apache::lonxml::get_id($parstack,$safeeval); |
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
|
if ($#Apache::inputtags::import > -1) { |
if ($#Apache::inputtags::import > -1) { |
&Apache::lonxml::debug("Turning :$id: into"); |
&Apache::lonxml::debug("Turning :$id: into"); |
$id = join('_',@Apache::inputtags::import).'_'.$id; |
$id = join('_',@Apache::inputtags::import).'_'.$id; |
Line 68 sub end_response {
|
Line 68 sub end_response {
|
|
|
sub start_hintresponse { |
sub start_hintresponse { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id = &Apache::lonxml::get_id($parstack,$safeeval); |
if ($id eq '') { $id = $Apache::lonxml::curdepth; } |
push (@Apache::inputtags::hint,$id); |
push (@Apache::inputtags::response,$id); |
push (@Apache::inputtags::hintlist,$id); |
push (@Apache::inputtags::responselist,$id); |
|
push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]); |
push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]); |
return $id; |
return $id; |
} |
} |
|
|
sub end_hintresponse { |
sub end_hintresponse { |
pop @Apache::inputtags::response; |
pop @Apache::inputtags::hint; |
if (defined($Apache::inputtags::paramstack[-1])) { |
if (defined($Apache::inputtags::paramstack[-1])) { |
%Apache::inputtags::params= |
%Apache::inputtags::params= |
@{ pop(@Apache::inputtags::paramstack) }; |
@{ pop(@Apache::inputtags::paramstack) }; |
Line 93 sub pushrandomnumber {
|
Line 92 sub pushrandomnumber {
|
# do nothing |
# do nothing |
} else { |
} else { |
my @seed=&Math::Random::random_get_seed(); |
my @seed=&Math::Random::random_get_seed(); |
push (@randomseeds,\@seed); |
push(@randomseeds,\@seed); |
} |
} |
&Apache::response::setrandomnumber(); |
&Apache::response::setrandomnumber(@_); |
} |
} |
sub poprandomnumber { |
sub poprandomnumber { |
my $rand_alg=&Apache::lonnet::get_rand_alg(); |
my $rand_alg=&Apache::lonnet::get_rand_alg(); |
Line 110 sub poprandomnumber {
|
Line 109 sub poprandomnumber {
|
&Apache::lonxml::error("Unable to restore random algorithm."); |
&Apache::lonxml::error("Unable to restore random algorithm."); |
} |
} |
} |
} |
|
|
sub setrandomnumber { |
sub setrandomnumber { |
|
my ($ignore_id2) = @_; |
my $rndseed; |
my $rndseed; |
$rndseed=&Apache::structuretags::setup_rndseed(); |
$rndseed=&Apache::structuretags::setup_rndseed(); |
if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); } |
if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); } |
&Apache::lonxml::debug("randseed $rndseed"); |
&Apache::lonxml::debug("randseed $rndseed"); |
# $rndseed=unpack("%32i",$rndseed); |
# $rndseed=unpack("%32i",$rndseed); |
my $rand_alg=&Apache::lonnet::get_rand_alg(); |
my $rand_alg=&Apache::lonnet::get_rand_alg(); |
my $rndmod; |
my ($rndmod,$rndmod2); |
|
|
|
my ($id1,$id2,$shift_amt); |
|
if ($Apache::lonhomework::parsing_a_problem) { |
|
$id1=$Apache::inputtags::part; |
|
if (defined($Apache::inputtags::response[-1])) { |
|
$id2=$Apache::inputtags::response[-1]; |
|
} |
|
$shift_amt=scalar(@Apache::inputtags::responselist); |
|
} elsif ($Apache::lonhomework::parsing_a_task) { |
|
$id1=&Apache::bridgetask::get_dim_id(); |
|
if (!$ignore_id2 && ref($Apache::bridgetask::instance{$id1})) { |
|
$id2=$Apache::bridgetask::instance{$id1}[-1]; |
|
$shift_amt=scalar(@{$Apache::bridgetask::instance{$id1}}); |
|
} else { |
|
$shift_amt=0; |
|
} |
|
} |
|
&Apache::lonxml::debug("id1: $id1, id2: $id2, shift_amt: $shift_amt"); |
if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' || |
if (!$rand_alg || $rand_alg eq '32bit' || $rand_alg eq '64bit' || |
$rand_alg eq '64bit2') { |
$rand_alg eq '64bit2') { |
$rndmod=(&Apache::lonnet::numval($Apache::inputtags::part) << 10); |
$rndmod=(&Apache::lonnet::numval($id1) << 10); |
if (defined($Apache::inputtags::response[-1])) { |
if (defined($id2)) { $rndmod+=&Apache::lonnet::numval($id2); } |
$rndmod+=&Apache::lonnet::numval($Apache::inputtags::response[-1]); |
} elsif ($rand_alg eq '64bit3') { |
|
$rndmod=(&Apache::lonnet::numval2($id1) << 10); |
|
if (defined($id2)) { $rndmod+=&Apache::lonnet::numval2($id2); } |
|
} elsif ($rand_alg eq '64bit4') { |
|
my $shift=(4*$shift_amt)%30; |
|
$rndmod=(&Apache::lonnet::numval3($id1) << (($shift+15)%30)); |
|
if (defined($id2)) { |
|
$rndmod+=(&Apache::lonnet::numval3($id2) << $shift ); |
} |
} |
} else { |
} else { |
$rndmod=(&Apache::lonnet::numval2($Apache::inputtags::part) << 10); |
($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2"); |
if (defined($Apache::inputtags::response[-1])) { |
|
$rndmod+=&Apache::lonnet::numval2($Apache::inputtags::response[-1]); |
|
} |
|
} |
} |
|
|
if ($rndseed =~/([,:])/) { |
if ($rndseed =~/([,:])/) { |
my $char=$1; |
my $char=$1; |
use integer; |
use integer; |
my ($num1,$num2)=split(/\Q$char\E/,$rndseed); |
my ($num1,$num2)=split(/\Q$char\E/,$rndseed); |
$num1+=$rndmod; |
$num1+=$rndmod; |
$num2+=$rndmod; |
$num2+= ((defined($rndmod2)) ? $rndmod2 : $rndmod); |
|
if($Apache::lonnet::_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
$rndseed=$num1.$char.$num2; |
$rndseed=$num1.$char.$num2; |
} else { |
} else { |
$rndseed+=$rndmod; |
$rndseed+=$rndmod; |
|
if($Apache::lonnet::_64bit) { |
|
use integer; |
|
$rndseed=(($rndseed<<32)>>32); |
|
} |
} |
} |
|
&Apache::lonxml::debug("randseed $rndmod $rndseed"); |
&Apache::lonnet::setup_random_from_rndseed($rndseed); |
&Apache::lonnet::setup_random_from_rndseed($rndseed); |
&Apache::lonxml::debug("randseed $rndseed"); |
|
return ''; |
return ''; |
} |
} |
|
|
Line 279 sub handle_previous {
|
Line 308 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::lonxml::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; |
} |
} |
my $vgr=&Apache::lonnet::allowed('vgr',$courseid); |
my $vgr=&Apache::lonnet::allowed('vgr',$courseid); |
Line 310 sub end_dataresponse {
|
Line 339 sub end_dataresponse {
|
my $result; |
my $result; |
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::lonxml::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); |
my $partid = $Apache::inputtags::part; |
my $partid = $Apache::inputtags::part; |
my $id = $Apache::inputtags::response['-1']; |
my $id = $Apache::inputtags::response['-1']; |
my $response = $ENV{'form.HWVAL_'.$id}; |
my $response = $env{'form.HWVAL_'.$id}; |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
$Apache::lonhomework::results{"resource.$partid.$id.$name"}=$response; |
$Apache::lonhomework::results{"resource.$partid.$id.$name"}=$response; |
Line 333 sub end_dataresponse {
|
Line 362 sub end_dataresponse {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub start_customresponse { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
|
push(@Apache::lonxml::namespace,'customresponse'); |
|
my $result; |
|
undef($Apache::response::custom_answer); |
|
&Apache::lonxml::register('Apache::response',('answer')); |
|
if ($target eq 'web') { |
|
if ( &Apache::response::show_answer() ) { |
|
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack, |
|
$safeeval); |
|
$Apache::inputtags::answertxt{$id}=$answer; |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('String to display for answer:', |
|
'answerdisplay',$token); |
|
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag; |
|
$constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'answerdisplay'); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.=&Apache::edit::handle_insert(); |
|
} |
|
} elsif ($target eq 'answer' || $target eq 'grade') { |
|
&Apache::response::reset_params(); |
|
} elsif ($target eq 'meta') { |
|
$result .= &Apache::response::meta_package_write('customresponse'); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_customresponse { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
my $part=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
if ( $target eq 'grade' && &Apache::response::submitted() ) { |
|
my $response = &Apache::response::getresponse(); |
|
if ($Apache::lonhomework::type eq 'exam' || |
|
&Apache::response::submitted('scantron')) { |
|
&Apache::response::scored_response($part,$id); |
|
} elsif ( $response =~ /[^\s]/ && |
|
$Apache::response::custom_answer_type eq 'loncapa/perl') { |
|
if (!$Apache::lonxml::default_homework_loaded) { |
|
&Apache::lonxml::default_homework_load($safeeval); |
|
} |
|
my %previous = &Apache::response::check_for_previous($response, |
|
$part,$id); |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
|
$response; |
|
my $error; |
|
${$safeeval->varglob('LONCAPA::customresponse_submission')}= |
|
$response; |
|
|
|
my $award = &Apache::run::run('{ my $submission=$LONCAPA::customresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval); |
|
if (!&Apache::inputtags::valid_award($award)) { |
|
$error = $award; |
|
$award = 'ERROR'; |
|
} |
|
&Apache::response::handle_previous(\%previous,$award); |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
|
$award; |
|
if ($error) { |
|
$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}= |
|
$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 'grade' || $target eq 'web' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
&Apache::lonxml::increment_counter(&Apache::response::repetition()); |
|
} |
|
pop(@Apache::lonxml::namespace); |
|
&Apache::lonxml::deregister('Apache::response',('answer')); |
|
&Apache::response::end_response(); |
|
return $result; |
|
} |
|
|
|
|
|
sub start_mathresponse { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
|
push(@Apache::lonxml::namespace,'mathresponse'); |
|
my $result; |
|
undef($Apache::response::custom_answer); |
|
&Apache::lonxml::register('Apache::response',('answer')); |
|
if ($target eq 'web') { |
|
if ( &Apache::response::show_answer() ) { |
|
my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack, |
|
$safeeval); |
|
$Apache::inputtags::answertxt{$id}=$answer; |
|
} |
|
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('String to display for answer:', |
|
'answerdisplay',$token); |
|
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag; |
|
$constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'answerdisplay'); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.=&Apache::edit::handle_insert(); |
|
} |
|
} elsif ($target eq 'answer' || $target eq 'grade') { |
|
&Apache::response::reset_params(); |
|
} elsif ($target eq 'meta') { |
|
$result .= &Apache::response::meta_package_write('mathresponse'); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_mathresponse { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
my $part=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
if ( $target eq 'grade' && &Apache::response::submitted() ) { |
|
my $response = &Apache::response::getresponse(); |
|
if ( $response =~ /[^\s]/ && |
|
$Apache::response::custom_answer_type eq 'loncapa/perl') { |
|
if (!$Apache::lonxml::default_homework_loaded) { |
|
&Apache::lonxml::default_homework_load($safeeval); |
|
} |
|
my %previous = &Apache::response::check_for_previous($response, |
|
$part,$id); |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
|
$response; |
|
my $error; |
|
${$safeeval->varglob('LONCAPA::mathresponse_submission')}= |
|
$response; |
|
|
|
my $award = &Apache::run::run('{ my $submission=$LONCAPA::mathresponse_submission;'.$Apache::response::custom_answer.'}',$safeeval); |
|
if (!&Apache::inputtags::valid_award($award)) { |
|
$error = $award; |
|
$award = 'ERROR'; |
|
} |
|
&Apache::response::handle_previous(\%previous,$award); |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
|
$award; |
|
if ($error) { |
|
$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}= |
|
$error; |
|
} |
|
} |
|
} |
|
pop(@Apache::lonxml::namespace); |
|
&Apache::lonxml::deregister('Apache::response',('answer')); |
|
&Apache::response::end_response(); |
|
return $result; |
|
} |
|
|
|
|
|
sub start_answer { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
|
$Apache::response::custom_answer= |
|
&Apache::lonxml::get_all_text_unbalanced("/answer",$parser); |
|
$Apache::response::custom_answer_type= |
|
lc(&Apache::lonxml::get_param('type',$parstack,$safeeval)); |
|
$Apache::response::custom_answer_type =~ s/\s+//g; |
|
if ($target eq "edit" ) { |
|
$result=&Apache::edit::tag_start($target,$token,'Answer algorithm'); |
|
$result.=&Apache::edit::editfield($token->[1], |
|
$Apache::response::custom_answer, |
|
'',80,4); |
|
} elsif ( $target eq "modified" ) { |
|
$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser); |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_answer { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
if ($target eq 'edit' ) { |
|
return &Apache::edit::end_table(); |
|
} |
|
} |
|
|
sub decide_package { |
sub decide_package { |
my ($tagstack)=@_; |
my ($tagstack)=@_; |
my $package; |
my $package; |
Line 385 sub start_responseparam {
|
Line 606 sub start_responseparam {
|
$safeeval,'name','type', |
$safeeval,'name','type', |
'description','default'); |
'description','default'); |
my $element=&Apache::edit::html_element_name('parameter_package'); |
my $element=&Apache::edit::html_element_name('parameter_package'); |
if (defined($ENV{"form.$element"}) && $ENV{"form.$element"} ne '') { |
if (defined($env{"form.$element"}) && $env{"form.$element"} ne '') { |
my $name=$ENV{"form.$element"}; |
my $name=$env{"form.$element"}; |
my $tag=&decide_package($tagstack); |
my $tag=&decide_package($tagstack); |
$token->[2]->{'name'}=$name; |
$token->[2]->{'name'}=$name; |
$token->[2]->{'type'}= |
$token->[2]->{'type'}= |
Line 403 sub start_responseparam {
|
Line 624 sub start_responseparam {
|
} |
} |
} 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' ) { |
if ($ENV{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
my $name =&Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name =&Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $default=&Apache::lonxml::get_param('default',$parstack, |
my $default=&Apache::lonxml::get_param('default',$parstack, |
$safeeval); |
$safeeval); |
Line 420 sub end_responseparam {
|
Line 641 sub end_responseparam {
|
} |
} |
|
|
sub start_parameter { |
sub start_parameter { |
my $result = &start_responseparam(@_); |
return &start_responseparam(@_); |
return $result; |
|
} |
} |
|
|
sub end_parameter { |
sub end_parameter { |
my $result = &end_responseparam(@_); |
return &end_responseparam(@_); |
return $result; |
|
} |
} |
|
|
sub reset_params { |
sub reset_params { |
Line 436 sub reset_params {
|
Line 655 sub reset_params {
|
sub setup_params { |
sub setup_params { |
my ($tag,$safeeval) = @_; |
my ($tag,$safeeval) = @_; |
|
|
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 =~ /^$tag/) { |
Line 465 sub setup_params {
|
Line 684 sub setup_params {
|
} |
} |
} |
} |
|
|
|
{ |
|
my @answer_bits; |
|
|
sub answer_header { |
sub answer_header { |
my ($type) = @_; |
my ($type,$increment) = @_; |
my $result; |
my $result; |
if ($ENV{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
$result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'. |
undef(@answer_bits); |
$Apache::inputtags::part.'| \\\\ \hline '; |
my $bit; |
|
if ($Apache::lonhomework::type eq 'exam') { |
|
$bit = ($Apache::lonxml::counter+$increment).') '; |
|
} else { |
|
$bit .= ' Answer for Part: \verb|'. |
|
$Apache::inputtags::part.'| '; |
|
} |
|
push(@answer_bits,$bit); |
} else { |
} else { |
$result = '<table border="1"><tr><td>Answer for Part:'. |
$result = '<table border="1"><tr>'; |
$Apache::inputtags::part. '</td>'."\n"; |
if ($Apache::lonhomework::type eq 'exam') { |
|
$result .= '<td>'.($Apache::lonxml::counter+$increment). ')</td>'; |
|
} else { |
|
$result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>'; |
|
} |
|
$result .= "\n"; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 481 sub answer_header {
|
Line 715 sub answer_header {
|
sub answer_part { |
sub answer_part { |
my ($type,$answer) = @_; |
my ($type,$answer) = @_; |
my $result; |
my $result; |
if ($ENV{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
$result = ' \verb|'.$answer.'|\\\\ \hline '; |
my $to_use='|'; |
|
foreach my $value (32..126) { |
|
my $char=pack('c',$value); |
|
if ($answer !~ /\Q$char\E/) { |
|
$to_use=$char; |
|
last; |
|
} |
|
} |
|
if ($answer ne '') { |
|
push(@answer_bits,'\verb'.$to_use.$answer.$to_use); |
|
} |
} else { |
} else { |
$result = '<td>'.$answer.'</td>'; |
$result = '<td>'.$answer.'</td>'; |
} |
} |
Line 492 sub answer_part {
|
Line 736 sub answer_part {
|
sub answer_footer { |
sub answer_footer { |
my ($type) = @_; |
my ($type) = @_; |
my $result; |
my $result; |
if ($ENV{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
$result = ' \end{tabular} \vskip 0 mm '; |
my $columns = scalar(@answer_bits); |
|
$result = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline '; |
|
$result .= join(' & ',@answer_bits); |
|
$result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm '; |
} else { |
} else { |
$result = '</tr></table>'; |
$result = '</tr></table>'; |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
|
} |
|
|
sub showallfoils { |
sub showallfoils { |
if (defined($ENV{'form.showallfoils'})) { |
if (defined($env{'form.showallfoils'})) { |
my ($symb)=&Apache::lonxml::whichuser(); |
my ($symb)=&Apache::lonxml::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) ) { |
return 1; |
return 1; |
} |
} |
} |
} |
Line 525 sub getresponse {
|
Line 775 sub getresponse {
|
'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, |
'W'=>22,'X'=>23,'Y'=>24,'Z'=>25); |
'W'=>22,'X'=>23,'Y'=>24,'Z'=>25); |
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). |
$response = $env{'scantron.'.($Apache::lonxml::counter+$temp-1). |
'.answer'}; |
'.answer'}; |
# save bubbled letter for later |
# save bubbled letter for later |
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
Line 541 sub getresponse {
|
Line 791 sub getresponse {
|
} |
} |
} |
} |
} else { |
} else { |
$response = $ENV{$formparm}; |
$response = $env{$formparm}; |
} |
} |
return $response; |
return $response; |
} |
} |
Line 549 sub getresponse {
|
Line 799 sub getresponse {
|
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"); |
my $repetition = int $weight/9; |
if (!defined($weight) || ($weight eq '')) { $weight=1; } |
if ($weight % 9 != 0) {$repetition++;} |
my $repetition = int($weight/10); |
|
if ($weight % 10 != 0) { $repetition++; } |
return $repetition; |
return $repetition; |
} |
} |
|
|
Line 559 sub scored_response {
|
Line 810 sub scored_response {
|
my $repetition=&repetition(); |
my $repetition=&repetition(); |
my $score=0; |
my $score=0; |
for (my $i=0;$i<$repetition;$i++) { |
for (my $i=0;$i<$repetition;$i++) { |
|
# A is 1, B is 2, etc. (get response return 0-9 and then we add 1) |
my $increase=&Apache::response::getresponse($i+1); |
my $increase=&Apache::response::getresponse($i+1); |
if ($increase ne '') { $score+=$increase+1; } |
if ($increase ne '') { $score+=$increase+1; } |
} |
} |
Line 692 sub pick_foil_for_concept {
|
Line 944 sub pick_foil_for_concept {
|
sub get_response_param { |
sub get_response_param { |
my ($id,$name,$default)=@_; |
my ($id,$name,$default)=@_; |
my $parameter; |
my $parameter; |
if ($ENV{'request.state'} eq 'construct' && |
if ($env{'request.state'} eq 'construct' && |
defined($Apache::inputtags::params{$name})) { |
defined($Apache::inputtags::params{$name})) { |
$parameter=$Apache::inputtags::params{$name}; |
$parameter=$Apache::inputtags::params{$name}; |
} else { |
} else { |
Line 704 sub get_response_param {
|
Line 956 sub get_response_param {
|
return $parameter; |
return $parameter; |
} |
} |
|
|
|
sub submitted { |
|
my ($who)=@_; |
|
|
|
# when scatron grading any submission is a submission |
|
if ($env{'form.submitted'} eq 'scantron') { return 1; } |
|
# if the caller only cared if this was a scantron submission |
|
if ($who eq 'scantron') { return 0; } |
|
# if the Submit Answer button for this particular part was pressed |
|
my $partid=$Apache::inputtags::part; |
|
if (defined($env{'form.submit_'.$partid})) { return 1; } |
|
# Submit All button on a .page was pressed |
|
if (defined($env{'form.all_submit'})) { return 1; } |
|
# otherwise no submission occured |
|
return 0; |
|
} |
|
|
|
sub add_to_gradingqueue { |
|
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
|
if ( $courseid eq '' |
|
|| $symb eq '' |
|
|| $env{'request.state'} eq 'construct' |
|
|| $Apache::lonhomework::type ne 'problem') { |
|
return; |
|
} |
|
|
|
my %queue_info = ( 'type' => 'problem', |
|
'time' => time); |
|
|
|
if (exists($Apache::lonhomework::history{"resource.0.checkedin.slot"})) { |
|
$queue_info{'slot'}= |
|
$Apache::lonhomework::history{"resource.0.checkedin.slot"}; |
|
} |
|
|
|
my $result=&Apache::bridgetask::add_to_queue('gradingqueue',\%queue_info); |
|
if ($result ne 'ok') { |
|
&Apache::lonxml::error("add_to_queue said $result"); |
|
} |
|
} |
|
|
|
# basically undef and 0 (both false) mean that they still have work to do |
|
# and all true values mean that they can't do any more work |
|
# |
|
# a return of undef means it is unattempted |
|
# a return of 0 means it is attmpted and wrong but still has tries |
|
# a return of 1 means it is marked correct |
|
# a return of 2 means they have exceed maximum number of tries |
|
# a return of 3 means it after the answer date |
|
sub check_status { |
|
my ($id)=@_; |
|
if (!defined($id)) { $id=$Apache::inputtags::part; } |
|
my $curtime=&Apache::lonnet::EXT('system.time'); |
|
my $opendate=&Apache::lonnet::EXT("resource.$id.opendate"); |
|
my $duedate=&Apache::lonnet::EXT("resource.$id.duedate"); |
|
my $answerdate=&Apache::lonnet::EXT("resource.$id.answerdate"); |
|
if ( $opendate && $curtime > $opendate && |
|
$duedate && $curtime > $duedate && |
|
$answerdate && $curtime > $answerdate) { |
|
return 3; |
|
} |
|
my $status=&Apache::lonnet::EXT("user.resource.resource.$id.solved"); |
|
if ($status =~ /^correct/) { return 1; } |
|
if (!$status) { return undef; } |
|
my $maxtries=&Apache::lonnet::EXT("resource.$id.maxtries"); |
|
if ($maxtries eq '') { $maxtries=2; } |
|
my $curtries=&Apache::lonnet::EXT("user.resource.resource.$id.tries"); |
|
if ($curtries < $maxtries) { return 0; } |
|
return 2; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|