--- loncom/homework/response.pm 2007/06/19 19:34:18 1.171 +++ loncom/homework/response.pm 2008/03/06 16:28:20 1.188 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.171 2007/06/19 19:34:18 albertel Exp $ +# $Id: response.pm,v 1.188 2008/03/06 16:28:20 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -451,7 +451,12 @@ sub end_customresponse { } 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); @@ -569,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; @@ -671,6 +676,7 @@ 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) { @@ -784,6 +790,8 @@ sub next_answer { sub answer_part { my ($type,$answer,$args) = @_; + &Apache::lonxml::debug("In answerpart :$type:$answer:$args:"); + my $result; if ($env{'form.answer_output_mode'} eq 'tex') { if (!$args->{'no_verbatim'}) { @@ -795,9 +803,13 @@ sub answer_part { last; } } - if ($answer ne '') { - $answer = '\verb'.$to_use.$answer.$to_use; - } + my $answerelements=$answer; + $answer=''; + foreach my $element (split(/[\;\:]/,$answerelements)) { + if ($element ne '') { + $answer.= '\noindent\verb'.$to_use.$element.$to_use.'\newline'; + } + } } if ($answer ne '') { push(@answer_bits,$answer); @@ -807,7 +819,8 @@ sub answer_part { $result .= ''; $need_row_start = 0; } - $result .= ''.$answer.''; + $answer=~s/\; /\<\/nobr\>\
\/gs; + $result .= ''.$answer.''; } return $result; } @@ -816,12 +829,15 @@ 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 '; + my $columns = scalar(@answer_bits)-1; + $result = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|'.'p{3cm}|'x$columns.'}\hline '; $result .= join(' & ',@answer_bits); $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm '; } else { - $result = ''; + if (!$need_row_start) { + $result .= ''; + } + $result .= ''; } return $result; } @@ -860,11 +876,16 @@ Optional Arguments: $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 ($offset,$resulttype)=@_; + my ($offset,$resulttype, $lines, $bubbles_per_line)=@_; my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1']; my $response; if (!defined($offset)) { @@ -872,6 +893,9 @@ sub getresponse { } else { $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, 'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, @@ -879,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+$offset-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; @@ -890,10 +923,23 @@ 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; } @@ -1013,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"); } @@ -1175,6 +1221,21 @@ 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;