--- loncom/homework/caparesponse/caparesponse.pm 2010/08/20 03:44:18 1.236.12.1 +++ loncom/homework/caparesponse/caparesponse.pm 2014/12/30 20:03:15 1.255 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.236.12.1 2010/08/20 03:44:18 raeburn Exp $ +# $Id: caparesponse.pm,v 1.255 2014/12/30 20:03:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,8 +33,10 @@ use Safe::Hole; use Apache::lonmaxima(); use Apache::lonlocal; use Apache::lonnet; +use Apache::lonmsg(); use Apache::response(); use Storable qw(dclone); +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::caparesponse',('numericalresponse','stringresponse','formularesponse')); @@ -42,6 +44,8 @@ BEGIN { my %answer; my @answers; +my @alphabet=('A'..'Z'); + sub get_answer { return %answer; }; sub push_answer{ push(@answers,dclone(\%answer)); undef(%answer) } sub pop_answer { %answer = %{pop(@answers)}; }; @@ -279,6 +283,8 @@ sub start_numericalresponse { $token,40). &Apache::loncommon::help_open_topic('Formula_Response_Sampling'); } + $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess', + $token,10); $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag; @@ -286,11 +292,11 @@ sub start_numericalresponse { $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'answer', 'incorrect','unit', - 'format'); + 'format','preprocess'); } elsif ($token->[1] eq 'formularesponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'answer', - 'samples'); + 'samples','preprocess'); } if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); @@ -305,7 +311,7 @@ sub start_numericalresponse { my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); &Apache::lonxml::debug("Got unit $hideunit for $partid $id"); #no way to enter units, with radio buttons - if ((lc($hideunit) eq "yes") && ($Apache::lonhomework::type ne 'exam')) { + if ((lc($hideunit) eq "yes") && ($Apache::lonhomework::type ne 'exam')) { my $unit=&Apache::lonxml::get_param_var('unit',$parstack, $safeeval); if ($unit =~ /\S/) { $result.=" (in $unit) "; } @@ -401,7 +407,7 @@ sub setup_capa_response { sub check_submission { my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_; - my @args = ('type','tol','sig','format','unit','calc','samples'); + my @args = ('type','tol','sig','format','unit','calc','samples','preprocess'); my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response); my $hideunit= @@ -465,6 +471,48 @@ sub check_submission { return($ad,$msg, $name); } +sub stringresponse_gradechange { + my ($part,$id,$previous,$caller,$response,$ad,$type) = @_; + return unless (ref($previous) eq 'HASH'); + my ($prevarray,$prevaward); + my %typenames = ( + cs => 'Case sensitive', + ci => 'Case insensitive', + ); + if ($caller eq 'cs') { + return unless (ref($previous->{'version'}) eq 'ARRAY'); + $prevarray = $previous->{'version'}; + $prevaward = $previous->{'award'}; + } elsif ($caller eq 'ci') { + return unless (ref($previous->{'versionci'}) eq 'ARRAY'); + $prevarray = $previous->{'versionci'}; + $prevaward = $previous->{'awardci'}; + } else { + return; + } + my $count=0; + my %count_lookup; + foreach my $i (1..$Apache::lonhomework::history{'version'}) { + my $prefix = $i.":resource.$part"; + next if (!exists($Apache::lonhomework::history{"$prefix.award"})); + $count++; + $count_lookup{$i} = $count; + } + my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser(); + my %coursedesc = &Apache::lonnet::coursedescription($courseid); + my $cdom = $coursedesc{'domain'}; + my $versions = ' (submissions: '.join(', ',map {$count_lookup{$_} } @{$prevarray}).')'; + my $warning = "String Response ($typenames{$type}) grading discrepancy: award for response of $response changed from $prevaward".$versions." to $ad; user: $name:$domain in course: $courseid for part: $part response: $id for symb: $symb"; + &Apache::lonnet::logthis($warning); + my $origmail = $Apache::lonnet::perlvar{'lonAdmEMail'}; + my $recipients = &Apache::loncommon::build_recipient_list(undef,'errormail', + $cdom,$origmail); + if ($recipients ne '') { + &Apache::lonmsg::sendemail($recipients,'Stringresponse Grading Discrepancy',$warning); + } + return; +} + sub add_in_tag_answer { my ($parstack,$safeeval,$response_level) = @_; my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval, @@ -533,11 +581,18 @@ sub end_numericalresponse { $Apache::inputtags::params{'sig'}); } &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); - if ($Apache::lonhomework::type eq 'survey' && - ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || - $ad eq 'EXACT_ANS')) { - $ad='SUBMITTED'; - } + if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || + $ad eq 'EXACT_ANS')) { + if ($Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad='SUBMITTED_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $ad='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad='ANONYMOUS_CREDIT'; + } + } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg; @@ -558,7 +613,6 @@ sub end_numericalresponse { my $number_of_bubbles = scalar(@{ $bubble_values }); my $unit=&Apache::lonxml::get_param_var('unit',$parstack, $safeeval); - my @alphabet=('A'..'Z'); if ($target eq 'web') { if ($tag eq 'numericalresponse') { if ($unit=~/\S/) {$result.=' (in '.$unit.')

';} @@ -581,26 +635,8 @@ sub end_numericalresponse { $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} '; } if ($tag eq 'numericalresponse') { - my ($celllength,$number_of_tables,@table_range)= - &get_table_sizes($number_of_bubbles,$bubble_display); - my $j=0; - my $cou=0; - $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'; - for (my $i=0;$i<$number_of_tables;$i++) { - $result.='\vskip -1 mm \noindent \setlength{\tabcolsep}{2 mm}\begin{tabular}{'; - for (my $ind=0;$ind<$table_range[$j];$ind++) { - $result.='p{3 mm}p{'.$celllength.' mm}'; - } - $result.='}'; - for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) { - $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_display->[$ind].'} '; - if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';} - } - $cou += $table_range[$j]; - $j++; - $result.='\\\\\end{tabular}\vskip 0 mm '; - } - $result.='\end{enumerate}'; + $result .= &make_horizontal_latex_bubbles($bubble_values, $bubble_display, + '$\bigcirc$'); } else { $increment = &Apache::response::repetition(); } @@ -609,7 +645,7 @@ sub end_numericalresponse { if (($target eq 'web') && ($tag eq 'formularesponse') && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) { - $result.=&Apache::response::edit_mathresponse_button($id,"HWVAL_$id"); + $result.=&Apache::response::edit_mathresponse_button($partid,$id); } &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical); @@ -933,6 +969,15 @@ sub make_numerical_bubbles { my $number_of_bubbles = &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8); + # + # Fixes for BZ 6519 - number of bubbles <= 0 or non-integer. + # + $number_of_bubbles = int($number_of_bubbles + 0.5); + if ($number_of_bubbles <= 0) { + $number_of_bubbles = 8; + } + + my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); my $name = (exists($answer{$tag_internal_answer_name}) ? $tag_internal_answer_name @@ -1020,6 +1065,64 @@ sub make_numerical_bubbles { return (\@bubble_values,\@bubble_display,$correct); } +## +# Produce LaTeX bubbles laid out horizontally given a set of bubble values: +# +# @param bubble_values - reference to an array of bubble 'values' +# @param bubble_display - reference to the array of texts to display to the user +# for each bubble_value (this is mostly for numerical response +# when the displayed value may not be an exact +# representation of the bubble value. +# @param bubble_fragment- The LaTeX fragment that will be plugged in to make +# the bubble itself. Note that the code will autonomously +# label each bubble with a lable...and that it's perfectly +# acceptable to use "" for the bubble_fragment. +# +# @return string - the LaTeX fragment that produces the bubbles. +# +sub make_horizontal_latex_bubbles { + my ($bubble_values, $bubble_display, $bubble_fragment) = @_; + my $result; + + my $number_of_bubbles = scalar(@{$bubble_values}); + + # Get the number of rows and columns in each row of the bubble + # table: + + my ($celllength, $number_of_tables, @table_range) = + &get_table_sizes($number_of_bubbles, $bubble_display); + + my $j=0; + my $cou=0; + $result.='\vskip 2mm \noindent '; + $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm '; + + for (my $i=0;$i<$number_of_tables;$i++) { + if ($i == 0) { + $result .= '\vskip -1mm '; + } else { + $result .= '\vskip 1mm '; + } + $result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{'; + for (my $ind=0;$ind<$table_range[$j];$ind++) { + $result.='p{4 mm}p{'.$celllength.' mm}'; + } + $result.='}'; + for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) { + $result.='\hskip -4 mm {\small \textbf{ '.$alphabet[$ind].'}}' + . $bubble_fragment + . '& \hskip -3 mm {\small '.$bubble_display->[$ind].'} '; + if ($ind != $cou+$table_range[$j]-1) { + $result.=' & '; + } + } + $cou += $table_range[$j]; + $j++; + $result.='\\\\\end{tabular}\vskip 0 mm '; + } + return $result; +} + sub get_tolrange { my ($ans,$tol)=@_; my ($high,$low); @@ -1079,6 +1182,7 @@ sub start_stringresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; my $id = &Apache::response::start_response($parstack,$safeeval); + undef(%answer); if ($target eq 'meta') { $result=&Apache::response::meta_package_write('stringresponse'); } elsif ($target eq 'edit') { @@ -1090,12 +1194,14 @@ sub start_stringresponse { ['re','Regular Expression']],$token); $result.=&Apache::edit::text_arg('String to display for answer:', 'answerdisplay',$token); + $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess', + $token,10); $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag; $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'answer', - 'type','answerdisplay'); + 'type','answerdisplay','preprocess'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); $result.=&Apache::edit::handle_insert(); @@ -1140,7 +1246,8 @@ sub end_stringresponse { my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { my %previous = &Apache::response::check_for_previous($response, - $part,$id); + $part,$id, + undef,$type); &Apache::lonxml::debug("submitted a $response
\n"); &Apache::lonxml::debug($$parstack[-1] . "\n
"); $Apache::lonhomework::results{"resource.$part.$id.submission"}= @@ -1154,23 +1261,53 @@ sub end_stringresponse { # $answer=$token->[2]->{'answer'}; # } ${$safeeval->varglob('LONCAPA::response')}=$response; + my $preprocess=&Apache::lonxml::get_param('preprocess',$parstack,$safeeval); + $preprocess=~s/^\&//; + if (defined($preprocess)) { + &Apache::run::run('$LONCAPA::response=&'.$preprocess.'($LONCAPA::response);',$safeeval); + } $result = &Apache::run::run('if ($LONCAPA::response=~m'.$answer.') { return 1; } else { return 0; }',$safeeval); &Apache::lonxml::debug("current $response"); &Apache::lonxml::debug("current $answer"); $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT'; } else { - my @args = ('type'); + my @args = ('type','preprocess'); my $args_ref = &setup_capa_args($safeeval,$parstack, \@args,$response); if ($$args_ref{'type'} eq '') { $$args_ref{'type'} = 'ci'; } &add_in_tag_answer($parstack,$safeeval); - my (@final_awards,@final_msgs,@names); + my (@final_awards,@final_msgs,@names,%ansstring); foreach my $name (keys(%answer)) { &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} })); ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name}); my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); + if ($$args_ref{'type'} =~ /^c[si]$/) { + $ansstring{$name} = pop(@msgs); + my $control_chars_removed = pop(@msgs); + my $error = pop(@msgs); + if (($error ne '') || + ($control_chars_removed)) { + my ($symb,$courseid,$sdomain,$sname) = + &Apache::lonnet::whichuser(); + if ($control_chars_removed) { + my $showresponse = $response; + if ($response =~ /[\000-\037]/) { + $response =~ s/[\000-\037]//g; + } + if ($showresponse =~ /[\r\n\f]/) { + my @lines = split(/[\r\n\f]+/,$showresponse); + $showresponse = join('\\n',@lines); + } + &Apache::lonnet::logthis("Stringresponse grading: control characters stripped from submission ".$showresponse." for $sname:$sdomain in $courseid for part: $part response: $id and symb: $symb"); + $Apache::lonhomework::results{"resource.$part.$id.submission"} = $response; + } + if ($error ne '') { + &Apache::lonnet::logthis("Stringresponse grading error: $error for $sname:$sdomain in $courseid for part: $part response: $id and symb: $symb"); + } + } + } &Apache::lonxml::debug('msgs are'.join(':',@msgs)); my ($awards)=split(/:/,$result); my (@awards) = split(/,/,$awards); @@ -1181,16 +1318,50 @@ sub end_stringresponse { push(@names,$name); &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); } - my ($ad, $msg, $name) = + ($ad, $msg, my $name) = &Apache::inputtags::finalizeawards(\@final_awards, \@final_msgs, \@names,1); + if (keys(%ansstring) > 0) { + $Apache::lonhomework::results{"resource.$part.$id.answerstring"} = &Apache::lonnet::hash2str(%ansstring); + } } - if ($Apache::lonhomework::type eq 'survey' && - ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || - $ad eq 'EXACT_ANS')) { - $ad='SUBMITTED'; - } + if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || + $ad eq 'EXACT_ANS')) { + if ($Apache::lonhomework::type eq 'survey') { + $ad='SUBMITTED'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $ad='SUBMITTED_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'anonsurvey') { + $ad='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $ad='ANONYMOUS_CREDIT'; + } + } + unless (($env{'request.state'} eq 'construct') || + ($Apache::lonhomework::type eq 'randomizetry')) { + if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || $ad eq 'EXACT_ANS')) { + if ($previous{'used'}) { + if ($ad ne $previous{'award'}) { + if (($previous{'award'} eq 'INCORRECT' || + $previous{'award'} eq 'APPROX_ANS' || + $previous{'award'} eq 'EXACT_ANS')) { + &stringresponse_gradechange($part,$id,\%previous, + 'cs',$response,$ad,$type); + } + } + } elsif ($previous{'usedci'}) { + if ($ad ne $previous{'awardci'}) { + if (($previous{'awardci'} eq 'INCORRECT' || + $previous{'awardci'} eq 'APPROX_ANS' || + $previous{'awardci'} eq 'EXACT_ANS')) { + &stringresponse_gradechange($part,$id,\%previous, + 'ci',$response,$ad,$type); + } + } + } + } + } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg; @@ -1216,6 +1387,9 @@ sub end_stringresponse { if ($target eq 'answer') { $result.=&Apache::response::answer_part('stringresponse', $element); + if ($env{'form.grade_retrieveanswers'}) { + $env{'form.grade_answers.resource.'.$part.'.'.$id} = $element; + } } elsif ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"}{$name}[$i] }, $element); @@ -1259,8 +1433,8 @@ sub end_stringresponse { } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter(&Apache::response::repetition(), - "$part.$id"); + my $repetition = &Apache::response::repetition(); + &Apache::lonxml::increment_counter($repetition,"$part.$id"); if ($target eq 'analyze') { &Apache::lonhomework::set_bubble_lines(); }