--- loncom/homework/response.pm 2007/04/17 23:25:09 1.162 +++ loncom/homework/response.pm 2007/09/25 20:18:56 1.177 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.162 2007/04/17 23:25:09 albertel Exp $ +# $Id: response.pm,v 1.177 2007/09/25 20:18:56 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -391,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(); @@ -447,6 +446,9 @@ 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()); @@ -459,6 +461,11 @@ sub end_customresponse { return $result; } +sub format_prior_response_custom { + my ($mode,$answer) =@_; + return ''. + &HTML::Entities::encode($answer,'"<>&').''; +} sub start_mathresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -491,7 +498,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(); @@ -536,6 +542,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); @@ -544,6 +554,12 @@ sub end_mathresponse { return $result; } +sub format_prior_response_math { + my ($mode,$answer) =@_; + return ''. + &HTML::Entities::encode($answer,'"<>&').''; +} + sub implicit_multiplication { my ($expression)=@_; # Escape scientific notation, so 3e8 does not become 3*e*8 @@ -553,15 +569,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; @@ -659,7 +675,6 @@ sub start_responseparam { } 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' ) { @@ -826,15 +841,46 @@ 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, 'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, @@ -842,24 +888,55 @@ 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'}; - # save bubbled letter for later - $Apache::lonhomework::results{"resource.$part.$id.scantron"}.= - $response; + + my $line; + for ($line = 0; $line < $lines; $line++) { + $response = $env{'scantron.'. + ($Apache::lonxml::counter+$offset-1+$line). + '.answer'}; + if ($response ne "") { + last; + } + + } if ($resulttype ne 'letter') { if ($resulttype eq 'A is 1') { $response = $let_to_num{$response}+1; } 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); + } } + # save submitted response for later + $Apache::lonhomework::results{"resource.$part.$id.scantron"}.= + $response; + } 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"); @@ -869,6 +946,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(); @@ -1004,7 +1105,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; @@ -1095,6 +1206,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;