--- loncom/homework/essayresponse.pm 2002/08/07 16:23:05 1.15 +++ loncom/homework/essayresponse.pm 2004/12/06 18:09:54 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.15 2002/08/07 16:23:05 albertel Exp $ +# $Id: essayresponse.pm,v 1.52 2004/12/06 18:09:54 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,11 +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::lonlocal; BEGIN { &Apache::lonxml::register('Apache::essayresponse',('essayresponse')); @@ -43,25 +44,55 @@ 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"},'<>&"'); $result='
'; + $result.=''; if ($ncol > 0) { $result .=''; } - $result.='
'. + ' '. + &mt('Submit entries below as answer to receive credit').'
'. + ' '. + &mt('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 text below as answer to receive credit
'. - ''. - ' Save text below as a draft answer (not submitting it for credit yet) '. - '
'; + if ($uploadedfiletypes) { + $result.=''.&mt('Submit a file:'). + '

'. + &mt('Allowed filetypes: [_1]',$uploadedfiletypes).'
'. + 'OR:
Select Portfolio Files'. + '
'. + ''. + '
'; + if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){ + $result.="Portfolio files previously selected: ".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."
"; + } + + if ($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.=&mt('(Hand in a file you have prepared on your computer)'); + } + $result.=''; + } + $result.=''; } return $result; } @@ -70,34 +101,100 @@ sub end_essayresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $part = $Apache::inputtags::part; my $id = $Apache::inputtags::response[-1]; + my $increment = 1; my $result; 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'}) { - my $response = $ENV{'form.HWVAL'.$id}; - if ( $response =~ /[^\s]/) { - my $award; - if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { + if ( defined($ENV{'form.submitted'}) && + $ENV{'form.submitted'} eq 'scantron' ) { + $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'}; + my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id}; + if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { + my $award; + if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { $award='SUBMITTED'; } else { $award='DRAFT'; } + my $uploadedflag=0; + if ($filename =~ /[^\s]/) { + my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); + $uploadedfiletypes=~s/[^\w\,]//g; + $uploadedfiletypes=','.$uploadedfiletypes.','; + my ($extension)=($filename=~/\.(\w+)$/); + 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,undef,'essayresponse'); + $uploadedflag=1; + } else { + $award='INVALID_FILETYPE'; + } + } + if ($portfiles =~ /[^\s]/) { + $portfiles =~s/,$//; + $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles; + my @submitted_files = split /,/,$portfiles; + my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); + &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid); + &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid); + &Apache::lonnet::clear_selected_files($name); + $uploadedflag=1; + } $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; my %previous=&Apache::response::check_for_previous($response,$part,$id); - &Apache::response::handle_previous(\%previous,$award); + 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') { $result.=&Apache::edit::end_table(); + } elsif ($target eq 'tex') { + 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{'.&mt('Leave blank on scoring form'). + '}\vskip 0 mm'; + } + $result.= '\end{enumerate}'; + $increment=$repetition; + } + } + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter($increment); } - &Apache::response::end_response; + return $result; } 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.