--- loncom/homework/response.pm 2006/12/18 21:12:51 1.157
+++ loncom/homework/response.pm 2008/04/05 15:39:17 1.189
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.157 2006/12/18 21:12:51 www Exp $
+# $Id: response.pm,v 1.189 2008/04/05 15:39:17 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -265,11 +265,14 @@ sub meta_response_order {
}
sub check_for_previous {
- my ($curresponse,$partid,$id) = @_;
+ my ($curresponse,$partid,$id,$last) = @_;
my %previous;
$previous{'used'} = 0;
foreach my $key (sort(keys(%Apache::lonhomework::history))) {
if ($key =~ /resource\.$partid\.$id\.submission$/) {
+ if ( $last && $key =~ /^(\d+):/ ) {
+ next if ($1 >= $last);
+ }
&Apache::lonxml::debug("Trying $key");
my $pastresponse=$Apache::lonhomework::history{$key};
if ($pastresponse eq $curresponse) {
@@ -388,7 +391,6 @@ sub start_customresponse {
$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();
@@ -409,7 +411,7 @@ sub end_customresponse {
&Apache::response::submitted('scantron')) {
&Apache::response::scored_response($part,$id);
} 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) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -444,9 +446,17 @@ sub end_customresponse {
$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());
+ &Apache::lonxml::increment_counter(&Apache::response::repetition(),
+ "$part.$id");
+ if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
+ &Apache::lonhomework::set_bubble_lines();
+ }
}
pop(@Apache::lonxml::namespace);
pop(@Apache::response::custom_answer);
@@ -456,6 +466,11 @@ sub end_customresponse {
return $result;
}
+sub format_prior_response_custom {
+ my ($mode,$answer) =@_;
+ return '<span class="LC_prior_custom">'.
+ &HTML::Entities::encode($answer,'"<>&').'</span>';
+}
sub start_mathresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -488,7 +503,6 @@ sub start_mathresponse {
$safeeval,'answerdisplay','cas','args');
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
} elsif ($target eq 'answer' || $target eq 'grade') {
&Apache::response::reset_params();
@@ -533,6 +547,10 @@ sub end_mathresponse {
}
}
}
+ if ($target eq 'web') {
+ &setup_prior_tries_hash(\&format_prior_response_math);
+ }
+
pop(@Apache::lonxml::namespace);
pop(@Apache::response::custom_answer);
pop(@Apache::response::custom_answer_type);
@@ -541,6 +559,12 @@ sub end_mathresponse {
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
@@ -550,15 +574,15 @@ sub implicit_multiplication {
$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/(\w)\s+(\w)/$1\*$2/gs;
+ $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/(\w)\s+\(/$1\*\(/gs;
+ $expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs;
# )a -> )*a; )3 -> )*3; ) 3 -> )*3
- $expression=~s/\)\s*(\w)/\)\*$1/gs;
+ $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;
@@ -575,7 +599,7 @@ sub start_answer {
if ($target eq "edit" ) {
$result=&Apache::edit::tag_start($target,$token,'Answer algorithm');
$result.=&Apache::edit::editfield($token->[1],
- $Apache::response::custom_answer,
+ $Apache::response::custom_answer[-1],
'',80,4);
} elsif ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield('/answer',$parser);
@@ -652,11 +676,11 @@ sub start_responseparam {
$Apache::lonnet::packagetab{"$tag&$name&display"};
$token->[2]->{'default'}=
$Apache::lonnet::packagetab{"$tag&$name&default"};
+ $token->[3] = ['name','type','description','default'];
$constructtag=1;
}
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
}
} elsif ($target eq 'grade' || $target eq 'answer' || $target eq 'web' ||
$target eq 'tex' || $target eq 'analyze' ) {
@@ -694,7 +718,7 @@ sub setup_params {
if ($env{'request.state'} eq 'construct') { return; }
my %paramlist=();
foreach my $key (keys(%Apache::lonnet::packagetab)) {
- if ($key =~ /^$tag/) {
+ if ($key =~ /^\Q$tag\E/) {
my ($package,$name) = split(/&/,$key);
$paramlist{$name}=1;
}
@@ -777,9 +801,13 @@ sub answer_part {
last;
}
}
- if ($answer ne '') {
- $answer = '\verb'.$to_use.$answer.$to_use;
- }
+ my $fullanswer=$answer;
+ $answer='';
+ foreach my $element (split(/[\;]/,$fullanswer)) {
+ if ($element ne '') {
+ $answer.= '\verb'.$to_use.$element.$to_use.' \newline';
+ }
+ }
}
if ($answer ne '') {
push(@answer_bits,$answer);
@@ -798,12 +826,18 @@ sub answer_footer {
my ($type) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- 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 ';
+ $result = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|p{6.8cm}|}\hline ';
+ $result .= $answer_bits[0].'&\vspace*{-4mm}\begin{itemize}';
+ for (my $i=1;$i<=$#answer_bits;$i++) {
+ $result.='\item '.$answer_bits[$i].'\vspace*{-7mm}';
+ }
+ $result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm ';
+ &Apache::lonnet::logthis('Result: '.$result);
} else {
- $result = '</tr></table>';
+ if (!$need_row_start) {
+ $result .= '</tr>';
+ }
+ $result .= '</table>';
}
return $result;
}
@@ -823,14 +857,44 @@ sub showallfoils {
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 {
- my ($temp,$resulttype)=@_;
+ my ($offset,$resulttype, $lines, $bubbles_per_line)=@_;
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];
my $response;
- if (!defined($temp)) {
- $temp=1;
+ if (!defined($offset)) {
+ $offset=1;
} 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,
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
@@ -839,8 +903,17 @@ sub getresponse {
if ($env{'form.submitted'} eq 'scantron') {
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response[-1];
- $response = $env{'scantron.'.($Apache::lonxml::counter+$temp-1).
- '.answer'};
+
+ my $line;
+ for ($line = 0; $line < $lines; $line++) {
+ my $theline = $Apache::lonxml::counter+$offset-1+$line;
+ $response = $env{"scantron.$theline.answer"};
+ if ((defined($response)) && ($response ne "") && ($response ne " ")) {
+ last;
+ }
+
+ }
+
# save bubbled letter for later
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
$response;
@@ -850,13 +923,35 @@ sub getresponse {
} else {
$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 {
$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;
}
+=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 {
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
@@ -866,6 +961,30 @@ sub 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 {
my ($part,$id)=@_;
my $repetition=&repetition();
@@ -940,7 +1059,7 @@ sub show_answer {
my $award = $Apache::lonhomework::history{"resource.$part.solved"};
my $status = $Apache::inputtags::status[-1];
return ( ($award =~ /^correct/
- && lc($Apache::lonhomework::problemstatus) ne 'no')
+ && &Apache::lonhomework::show_problem_status())
|| $status eq "SHOW_ANSWER");
}
@@ -1001,7 +1120,17 @@ sub pick_foil_for_concept {
$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 {
my ($id,$name,$default)=@_;
my $parameter;
@@ -1026,7 +1155,13 @@ sub submitted {
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; }
+ 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
if (defined($env{'form.all_submit'})) { return 1; }
# otherwise no submission occured
@@ -1086,6 +1221,48 @@ sub check_status {
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;
__END__