--- loncom/homework/caparesponse/caparesponse.pm 2007/04/16 23:25:12 1.211
+++ loncom/homework/caparesponse/caparesponse.pm 2007/06/05 22:30:05 1.215
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.211 2007/04/16 23:25:12 albertel Exp $
+# $Id: caparesponse.pm,v 1.215 2007/06/05 22:30:05 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -392,9 +392,6 @@ sub setup_capa_args {
sub setup_capa_response {
my ($args_ref,$response) = @_;
- use Data::Dumper;
- &Apache::lonxml::debug("response dump is ".&Dumper($response));
-
if (ref($response)) {
$$args_ref{'response'}=dclone($response);
} else {
@@ -465,7 +462,7 @@ sub add_in_tag_answer {
my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
$response_level);
&Apache::lonxml::debug('answer is'.join(':',@answer));
- if (@answer && defined($answer[0])) {
+ if (@answer && $answer[0] =~ /\S/) {
$answer{$tag_internal_answer_name}= {'type' => 'ordered',
'answers' => [\@answer] };
}
@@ -601,7 +598,7 @@ sub end_numericalresponse {
}
}
}
- &setup_prior_tries_hash();
+ &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
} elsif ($target eq 'edit') {
$result.=''.&Apache::edit::end_table;
} elsif ($target eq 'answer' || $target eq 'analyze') {
@@ -792,18 +789,20 @@ sub end_numericalresponse {
return $result;
}
-sub setup_prior_tries_hash {
- #FIXME support multi answer numericals/formula
- my $part=$Apache::inputtags::part;
- my $id=$Apache::inputtags::response[-1];
- foreach my $i (1..$Apache::lonhomework::history{'version'}) {
- my $key = "$i:resource.$part.$id.submission";
- next if (!exists($Apache::lonhomework::history{"$key"}));
- $Apache::inputtags::submission_display{$key} =
- ''.
- &HTML::Entities::encode($Apache::lonhomework::history{$key},
- '"<>&').'';
+sub format_prior_response_numerical {
+ my ($mode,$answer) = @_;
+ if (ref($answer)) {
+ my $result = '
';
+ foreach my $element (@{ $answer }) {
+ $result.= ''.
+ &HTML::Entities::encode($element,'"<>&').' | ';
+ }
+ $result.='
';
+ return $result;
}
+ return ''.
+ &HTML::Entities::encode($answer,'"<>&').'';
+
}
sub check_for_answer_errors {
@@ -822,10 +821,9 @@ sub check_for_answer_errors {
} (sort(keys(%counts))));
&Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$counts);
}
- use Data::Dumper;
- &Apache::lonxml::debug("count dump is ".&Dumper(\%counts));
my $expected_number_of_inputs = (keys(%counts))[0];
- if ( $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
+ if ( $expected_number_of_inputs > 0
+ && $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
&Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.",
$expected_number_of_inputs,
scalar(@Apache::inputtags::inputlist)));
@@ -896,6 +894,11 @@ sub format_number {
sub make_numerical_bubbles {
my ($part,$id,$target,$parstack,$safeeval) =@_;
+
+ if (!%answer) {
+ &Apache::lonxml::error(&mt("No answers defined for response [_1] in part [_2] to make bubbles for.",$id,$part));
+ return ([],[],undef);
+ }
my $number_of_bubbles =
&Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
@@ -1025,17 +1028,10 @@ sub get_sigrange {
return ($sig_ubound,$sig_lbound);
}
-sub setup_prior_tries_hash_string {
- my $part=$Apache::inputtags::part;
- my $id=$Apache::inputtags::response[-1];
- foreach my $i (1..$Apache::lonhomework::history{'version'}) {
- my $key = "$i:resource.$part.$id.submission";
- next if (!exists($Apache::lonhomework::history{"$key"}));
- $Apache::inputtags::submission_display{$key} =
- ''.
- &HTML::Entities::encode($Apache::lonhomework::history{$key},
- '"<>&').'';
- }
+sub format_prior_response_string {
+ my ($mode,$answer) =@_;
+ return ''.
+ &HTML::Entities::encode($answer,'"<>&').'';
}
sub start_stringresponse {
@@ -1216,7 +1212,7 @@ sub end_stringresponse {
} elsif ($target eq 'edit') {
$result.=''.&Apache::edit::end_table;
} elsif ($target eq 'web' || $target eq 'tex') {
- &setup_prior_tries_hash_string();
+ &Apache::response::setup_prior_tries_hash(\&format_prior_response_string);
}
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {