version 1.221.2.2, 2011/11/29 18:44:31
|
version 1.226, 2011/09/13 21:42:58
|
Line 179 sub setrandomnumber {
|
Line 179 sub setrandomnumber {
|
} else { |
} else { |
($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2"); |
($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2"); |
} |
} |
|
$Apache::lonhomework::results{'resource.'.$id1.'.rawrndseed'}=$rndseed; |
if ($rndseed =~/([,:])/) { |
if ($rndseed =~/([,:])/) { |
my $char=$1; |
my $char=$1; |
use integer; |
use integer; |
Line 196 sub setrandomnumber {
|
Line 196 sub setrandomnumber {
|
} |
} |
} |
} |
&Apache::lonxml::debug("randseed $rndmod $rndseed"); |
&Apache::lonxml::debug("randseed $rndmod $rndseed"); |
|
$Apache::lonhomework::results{'resource.'.$id1.'.rndseed'}=$rndseed; |
&Apache::lonnet::setup_random_from_rndseed($rndseed); |
&Apache::lonnet::setup_random_from_rndseed($rndseed); |
return ''; |
return ''; |
} |
} |
Line 489 sub end_customresponse {
|
Line 490 sub end_customresponse {
|
$result .= &Apache::response::answer_footer('customresponse'); |
$result .= &Apache::response::answer_footer('customresponse'); |
} |
} |
if ($target eq 'web') { |
if ($target eq 'web') { |
&setup_prior_tries_hash(\&format_prior_response_custom); |
&setup_prior_tries_hash(\&format_prior_response_math); |
} |
} |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
Line 510 sub end_customresponse {
|
Line 511 sub end_customresponse {
|
|
|
sub format_prior_response_custom { |
sub format_prior_response_custom { |
my ($mode,$answer) =@_; |
my ($mode,$answer) =@_; |
if (ref($answer) eq 'ARRAY') { |
|
$answer = '('.join(', ', @{ $answer }).')'; |
|
} |
|
return '<span class="LC_prior_custom">'. |
return '<span class="LC_prior_custom">'. |
&HTML::Entities::encode($answer,'"<>&').'</span>'; |
&HTML::Entities::encode($answer,'"<>&').'</span>'; |
} |
} |
Line 1005 sub getresponse {
|
Line 1003 sub getresponse {
|
$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') { |
$response = $let_to_num{$response}; |
$response = $let_to_num{$response}+1; |
if ($resulttype eq 'A is 1') { |
} else { |
if ($response ne "") { |
$response = $let_to_num{$response}; |
$response = $response+1; |
|
} |
} |
} |
if ($response ne "") { |
if ($response ne "") { |
$response += $line * $bubbles_per_line; |
$response += $line * $bubbles_per_line; |
} |
} |
} else { |
} else { |
if ($response ne "") { |
if ($response ne "") { |
|
my $raw = $response; |
$response = chr(ord($response) + $line * $bubbles_per_line); |
$response = chr(ord($response) + $line * $bubbles_per_line); |
} |
} |
} |
} |
Line 1035 sub getresponse {
|
Line 1035 sub getresponse {
|
=item &repetition(); |
=item &repetition(); |
|
|
Returns the number of lines that are required to encode the weight. |
Returns the number of lines that are required to encode the weight. |
(Currently expects that there are 10 bubbles per line) |
(Default is for 10 bubbles per bubblesheet item; other (integer) |
|
values can be specified by using a custom Bubblesheet format file |
|
with an eighteenth entry (BubblesPerRow) set to the integer |
|
appropriate for the bubblesheets which will be used to assign weights. |
|
|
=cut |
=cut |
|
|
Line 1043 sub repetition {
|
Line 1046 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"); |
if (!defined($weight) || ($weight eq '')) { $weight=1; } |
if (!defined($weight) || ($weight eq '')) { $weight=1; } |
my $repetition = int($weight/10); |
my $bubbles_per_row; |
if ($weight % 10 != 0) { $repetition++; } |
if (($env{'form.bubbles_per_row'} =~ /^\d+$/) && |
|
($env{'form.bubbles_per_row'} > 0)) { |
|
$bubbles_per_row = $env{'form.bubbles_per_row'}; |
|
} else { |
|
$bubbles_per_row = 10; |
|
} |
|
my $repetition = int($weight/$bubbles_per_row); |
|
if ($weight % $bubbles_per_row != 0) { $repetition++; } |
return $repetition; |
return $repetition; |
} |
} |
|
|
Line 1143 sub whichorder {
|
Line 1153 sub whichorder {
|
|
|
sub show_answer { |
sub show_answer { |
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |
my $award = $Apache::lonhomework::history{"resource.$part.solved"}; |
my $award = $Apache::lonhomework::history{"resource.$part.awarded"}; |
my $status = $Apache::inputtags::status[-1]; |
my $status = $Apache::inputtags::status[-1]; |
return ( ($award =~ /^correct/ |
return ( ($award ==1 |
&& &Apache::lonhomework::show_problem_status()) |
&& &Apache::lonhomework::show_problem_status()) |
|| $status eq "SHOW_ANSWER"); |
|| $status eq "SHOW_ANSWER"); |
} |
} |