version 1.157, 2006/12/18 21:12:51
|
version 1.164, 2007/05/17 09:40:48
|
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 409 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 444 sub end_customresponse {
|
Line 447 sub end_customresponse {
|
$result .= &Apache::response::answer_part('customresponse',$answer); |
$result .= &Apache::response::answer_part('customresponse',$answer); |
$result .= &Apache::response::answer_footer('customresponse'); |
$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' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::increment_counter(&Apache::response::repetition()); |
&Apache::lonxml::increment_counter(&Apache::response::repetition()); |
Line 456 sub end_customresponse {
|
Line 462 sub end_customresponse {
|
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)=@_; |
Line 533 sub end_mathresponse {
|
Line 544 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); |
pop(@Apache::response::custom_answer_type); |
pop(@Apache::response::custom_answer_type); |
Line 541 sub end_mathresponse {
|
Line 556 sub end_mathresponse {
|
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 { |
sub implicit_multiplication { |
my ($expression)=@_; |
my ($expression)=@_; |
# Escape scientific notation, so 3e8 does not become 3*e*8 |
# Escape scientific notation, so 3e8 does not become 3*e*8 |
Line 575 sub start_answer {
|
Line 596 sub start_answer {
|
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 694 sub setup_params {
|
Line 715 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 1001 sub pick_foil_for_concept {
|
Line 1022 sub pick_foil_for_concept {
|
$Apache::response::conceptgroup{'names'}; |
$Apache::response::conceptgroup{'names'}; |
|
|
} |
} |
|
#------------------------------------------------------------ |
|
# |
|
# Get a parameter associated with a problem. |
|
# Parameters: |
|
# $id - the symb of the problem part within the map(?) ($part._$id). |
|
# $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 1026 sub submitted {
|
Line 1056 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 1086 sub check_status {
|
Line 1122 sub check_status {
|
return 2; |
return 2; |
} |
} |
|
|
|
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__ |
|
|