--- loncom/homework/essayresponse.pm 2003/04/18 08:00:04 1.28 +++ loncom/homework/essayresponse.pm 2003/04/29 20:32:21 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.28 2003/04/18 08:00:04 albertel Exp $ +# $Id: essayresponse.pm,v 1.32 2003/04/29 20:32:21 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -100,17 +100,7 @@ sub end_essayresponse { } if ( defined($ENV{'form.submitted'}) && $ENV{'form.submitted'} eq 'scantron' ) { - my $repetition=&Apache::response::repetition(); - $increment=$repetition; - my $score=0; - for (my $i=0;$i<$repetition;$i++) { - my $increase=&Apache::response::getresponse($i+1); - if ($increase ne '') { $score+=$increase+1; } - } - my $weight = &Apache::lonnet::EXT("resource.$id.weight"); - my $pcr=$score/$weight; - #FIXME, won't work for multiple essay in a single part - $Apache::lonhomewok::results{"resource.$id.awarded"}; + $increment=&Apache::response::scored_response($part,$id); } elsif ( defined($ENV{'form.submitted'}) ) { my $response = $ENV{'form.HWVAL_'.$id}; my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'}; @@ -140,6 +130,24 @@ sub end_essayresponse { $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; my %previous=&Apache::response::check_for_previous($response,$part,$id); unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); } +# +# Store with resource author for similarity testing +# + if ($award eq 'SUBMITTED') { + my ($symb,$crsid,$domain,$name)= + &Apache::lonxml::whichuser(); + if ($crsid) { + my $akey=$name.'.'.$domain.'.'.$crsid; + my $essayurl= + &Apache::lonnet::declutter($ENV{'REQUEST_URI'}); + my ($adom,$aname,$apath)= + ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/); + $apath=&Apache::lonnet::escape($apath); + $apath=~s/\W/\_/gs; + &Apache::lonnet::put('nohist_essay_'.$apath, + { $akey => $response },$adom,$aname); + } + } } } } elsif ($target eq 'edit') {