--- loncom/homework/essayresponse.pm 2003/04/18 08:00:04 1.28 +++ loncom/homework/essayresponse.pm 2004/10/06 18:50:14 1.38 @@ -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.38 2004/10/06 18:50:14 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,13 +25,12 @@ # # http://www.lon-capa.org/ # -# 4/3 Guy -# July, 2002, H. K. Ng -# + package Apache::essayresponse; use strict; -use Apache::lonxml; -use Apache::lonnet; +use Apache::lonxml(); +use Apache::lonnet(); +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::essayresponse',('essayresponse')); @@ -45,38 +44,46 @@ sub start_essayresponse { $result=&Apache::response::meta_package_write('essayresponse'); } elsif ($target eq 'web') { my $part= $Apache::inputtags::part; - my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); - my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"}); + my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); $uploadedfiletypes=~s/[^\w\,]//g; - my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}); + my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); $result='
'; $result.=''; + 'Select Portfolio Files'. + '
'. + ' '. + &mt('Submit entries below as answer to receive credit').'
'. + ' '. + &mt('Save entries below as a draft answer (not submitting them for credit yet)'). + ' '; if ($ncol > 0) { $result .=''; } if ($uploadedfiletypes) { - $result.= -''; } @@ -94,23 +101,13 @@ sub end_essayresponse { if ( $target eq 'grade' ) { my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id}; if ($collaborators =~ /[^\s]/) { - my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"}); + my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators if ($collaborators ne $previous_list); } 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'}; @@ -130,7 +127,7 @@ sub end_essayresponse { if ($uploadedfiletypes=~/\,$extension\,/i) { $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename; $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= - &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id); + &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse'); $uploadedflag=1; } else { $award='INVALID_FILETYPE'; @@ -140,6 +137,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') { @@ -148,11 +163,14 @@ sub end_essayresponse { if ($Apache::lonhomework::type eq 'exam') { my $repetition=&Apache::response::repetition(); $result.='\begin{enumerate}'; + if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';} for (my $i=0;$i<$repetition;$i++) { $result.='\item[\textbf{'.($Apache::lonxml::counter+$i). - '}.]\textit{Leave blank on scoring form}\vskip 0 mm'; + '}.]\textit{'.&mt('Leave blank on scoring form'). + '}\vskip 0 mm'; } $result.= '\end{enumerate}'; + $increment=$repetition; } } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

'. - ''. - ' Submit entries below as answer to receive credit
'. - ''. - ' Save entries below as a draft answer (not submitting them for credit yet) '. - '
'. 'Collaborators:
'. - '(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '. - 'smithje or smithje@'.$ENV{'user.domain'}.'.)
'; + &mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'
'; $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); $result .='
Submit a file:
Allowed filetypes: '.$uploadedfiletypes.'
'; + "'multipart/form-data'".';" />
'. + &mt('Allowed filetypes: [_1]',$uploadedfiletypes). + '
'; if ($uploadedfile) { - $result.='Currently submitted: '.$uploadedfile.''; + my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; + push (@Apache::lonxml::extlinks,$url); + &Apache::lonnet::allowuploaded('/adm/essayresponse',$url); + my $curfile=' '. + $uploadedfile.''; + $result.=&mt('Currently submitted: [_1]',$curfile); } else { - $result.='(Hand in a file you have prepared on your computer)'; + $result.=&mt('(Hand in a file you have prepared on your computer)'); } $result.='