--- loncom/homework/essayresponse.pm 2006/10/17 17:09:44 1.78 +++ loncom/homework/essayresponse.pm 2008/12/21 19:09:15 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.78 2006/10/17 17:09:44 albertel Exp $ +# $Id: essayresponse.pm,v 1.95 2008/12/21 19:09:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,8 +31,7 @@ use strict; use Apache::lonxml(); use Apache::lonnet; use Apache::lonlocal; -use lib '/home/httpd/lib/perl/'; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); BEGIN { @@ -52,6 +51,10 @@ sub start_essayresponse { 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 $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); + if (!defined($maxfilesize)) { + $maxfilesize = 10.0; #FIXME This should become a domain configuration + } if ( $Apache::lonhomework::type eq 'survey' ) { $result.= ' '; } @@ -71,15 +74,24 @@ sub start_essayresponse { if ($ncol > 0) { $result .=''.'
'; + &mt('Collaborators:').'
'. + &mt('(Enter a maximum of [quant,_1,collaborator] using username or username:domain, e.g. smithje or smithje:[_2].)',$ncol,$env{'user.domain'}); + if ($ncol > 1) { + $result .= '
'.&mt('If entering more than one, use spaces to separate the collaborators.'); + } + $result .= '
'; $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); $result .=''; } - $result.=&Apache::inputtags::file_selector($part,$id, - $uploadedfiletypes,'both'); + my $filesfrom = 'both'; + my $stuname = &Apache::lonnet::EXT('user.name'); + my $studom = &Apache::lonnet::EXT('user.domain'); + if (!&Apache::lonnet::usertools_access($stuname,$studom,'portfolio')) { + $filesfrom = 'uploadonly'; + } + $result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes, + $filesfrom,undef,$maxfilesize); $result.=''; } elsif ($target eq 'web' && $Apache::inputtags::status[-1] ne 'CAN_ANSWER') { @@ -128,7 +140,8 @@ sub end_essayresponse { $increment=&Apache::response::scored_response($part,$id); } elsif ( &Apache::response::submitted() ) { my $response = $env{'form.HWVAL_'.$id}; - my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'}; + my $filename = $env{'form.HWFILE'.$part.'_'.$id.'.filename'} || + $env{'form.HWFILETOOBIG'.$part.'_'.$id}; my $portfiles = $env{'form.HWPORT'.$part.'_'.$id}; if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { my $award='DRAFT'; @@ -136,8 +149,9 @@ sub end_essayresponse { $award='SUBMITTED'; } my $uploadedflag=0; - &file_submission($part,$id,'filename',\$award,\$uploadedflag); - &file_submission($part,$id,'portfiles',\$award,\$uploadedflag); + my $totalsize=0; + &file_submission($part,$id,'filename',\$award,\$uploadedflag,\$totalsize); + &file_submission($part,$id,'portfiles',\$award,\$uploadedflag,\$totalsize); $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); @@ -149,11 +163,12 @@ sub end_essayresponse { my ($symb,$crsid,$domain,$name)= &Apache::lonnet::whichuser(); if ($crsid) { - my $akey=$name.'.'.$domain.'.'.$crsid; + my $akey=join('.',&escape($name),&escape($domain), + &escape($crsid)); my $essayurl= &Apache::lonnet::declutter($ENV{'REQUEST_URI'}); my ($adom,$aname,$apath)= - ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/); + ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); $apath=&escape($apath); $apath=~s/\W/\_/gs; &Apache::lonnet::put('nohist_essay_'.$apath, @@ -171,66 +186,195 @@ sub end_essayresponse { } elsif ($target eq 'answer') { $result.=&Apache::response::answer_header($$tagstack[-1]); - my $answer = &mt('Answer for essay will be hand graded.'); + my $answer = &mt('Essay will be hand graded.'); $result.=&Apache::response::answer_part($$tagstack[-1],$answer, {'no_verbatim' => 1}); $result.=&Apache::response::answer_footer($$tagstack[-1]); } + if ($target eq 'web') { + &Apache::response::setup_prior_tries_hash(\&format_prior_response, + ['portfiles', + 'uploadedurl']); + } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter($increment); + &Apache::lonxml::increment_counter($increment, "$part.$id"); + + if ($target eq 'analyze') { + $Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse'; + &Apache::lonhomework::set_bubble_lines(); + } } &Apache::response::end_response; return $result; } +sub format_prior_response { + my ($mode,$answer,$other_data) = @_; + my $output; + + my (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser(); + my $port_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; + + my $file_list; + + foreach my $file (split(/\s*,\s*/, + $other_data->[0].','.$other_data->[1])) { + next if ($file!~/\S/); + if ($file !~ m{^/uploaded/}) { $file=$port_url.$file; } + $file=~s|/+|/|g; + &Apache::lonnet::allowuploaded('/adm/essayresponse',$file); + $file_list.='
  • file icon '.$file. + '
    • '."\n"; + } + if ($file_list) { + $output.= &mt('Submitted Files').''; + } + if ($answer =~ /\S/) { + $output.='

    '.&mt('Submitted text'). + '

    '.$answer.'

    '; + } + + return '
    '.$output.'
    '; +} + sub file_submission { - my ($part,$id,$which,$award,$uploadedflag)=@_; + my ($part,$id,$which,$award,$uploadedflag,$totalsize)=@_; my $files; my $jspart=$part; $jspart=~s/\./_/g; - if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; } - if ($which eq 'filename') { - $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; + if ($which eq 'portfiles') { + $files= $env{'form.HWPORT'.$jspart.'_'.$id}; + } elsif ($which eq 'filename') { + if ($env{'form.HWFILETOOBIG'.$jspart.'_'.$id} ne '') { + $$award = 'EXCESS_FILESIZE'; + return; + } else { + $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; + } } - if ($files =~ /[^\s]/) { $files =~s/,$//; - $Apache::lonhomework::results{"resource.$part.$id.$which"}=$files; - - my @submitted_files = ($files); - if ( $which eq 'portfiles' ) { - @submitted_files = split(/\s*,\s*/,$files); - } - - my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); - if ($uploadedfiletypes) { - $uploadedfiletypes=~s/[^\w\,]//g; - $uploadedfiletypes=','.$uploadedfiletypes.','; - foreach my $file (@submitted_files) { - my ($extension)=($file=~/\.(\w+)$/); - unless ($uploadedfiletypes=~/\,$extension\,/i) { - $$award='INVALID_FILETYPE'; - } - } - } - if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { + my (@submitted_files,@acceptable_files,@accepted_files); + if ($which eq 'portfiles') { + @submitted_files = split(/\s*,\s*/,$files); + } else { + @submitted_files = ($files); + } + my $uploadedfiletypes= + &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); + if ($uploadedfiletypes) { + $uploadedfiletypes=~s/[^\w\,]//g; + $uploadedfiletypes=','.$uploadedfiletypes.','; + foreach my $file (@submitted_files) { + my ($extension)=($file=~/\.(\w+)$/); + if ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) { + push(@acceptable_files,$file); + } else { + $$award='INVALID_FILETYPE'; + if ($which eq 'filename') { + &delete_form_items($jspart,$id); + } + } + } + } + my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); + if (!$maxfilesize) { + $maxfilesize = 10.0; #FIXME This should become a domain configuration + } + my %dirlist; + foreach my $file (@acceptable_files) { + if ($which eq 'filename') { + if (ref($totalsize)) { + $$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; + } + } else { + my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); + my ($path,$filename) = ($file =~ m{^(.+)/([^/]+)$}); + my $fullpath = '/userfiles/portfolio'.$path; + if (!exists($dirlist{$fullpath})) { + my @list = &Apache::lonnet::dirlist($fullpath,$udom,$uname,1); + foreach my $dir_line (@list) { + my ($fname,$dom,undef,$testdir,undef,undef,undef,undef, + $size,undef,$mtime,undef,undef,undef,$obs,undef) = + split(/\&/,$dir_line,16); + if ($filename eq $fname) { + my $mbsize = $size/(1024.0*1024.0); + if (ref($totalsize)) { + $$totalsize += $mbsize; + } + last; + } + } + $dirlist{$fullpath} = \@list; + } + } + if (ref($totalsize)) { + if ($$totalsize > $maxfilesize) { + $$award='EXCESS_FILESIZE'; + if ($which eq 'filename') { + &delete_form_items($jspart,$id); + } + } else { + push(@accepted_files,$file); + } + } else { + push(@accepted_files,$file); + } + } + $Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); + if (($$award eq 'INVALID_FILETYPE') || ($award eq 'EXCESS_FILESIZE')) { + return; + } + if (ref($uploadedflag)) { $$uploadedflag=1; } - if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { - my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); + my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); + if ($which eq 'portfiles') { &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]); &Apache::lonnet::clear_selected_files($name); } - if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') { + if ($which eq 'filename') { $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= $files; + my $cleanpart = $part; + $cleanpart =~ s/\W/_/g; + my $cleanid = $id; + $cleanid =~ s/\W/_/g; + my ($map,$resid,$res)=&Apache::lonnet::decode_symb($symb); + my $container; + if ($map =~ /^uploaded/) { + (my $prefix,$container) = ($map =~ m{^uploaded/[^/]+/[^/]+/(default|supplemental)_?([^.]*)\.(?:sequence|page)$}); + if (length($container) > 10) { + $container = substr($container,-10,10); + } + if ($container ne '') { + $container = $prefix.'_'.$container; + } else { + $container = $prefix; + } + } else { + ($container) = ($map =~ m{(.+)\.(?:sequence|page)$}); + $container =~ s/\W/_/g; + if (length($container) > 255) { + $container = substr($container,0,254); + } + } + my $subdir = 'essayresponse'; + my %crsdesc = &Apache::lonnet::coursedescription($crsid); + foreach my $item ($crsdesc{'domain'},$crsdesc{'num'},$container,$resid,$cleanpart,$cleanid) { + if ($item ne '') { + $subdir .= '/'.$item; + } + } $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= &Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, - 'essayresponse'); + $subdir); + &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); } } elsif ($which eq 'portfiles' && $Apache::lonhomework::history{"resource.$part.$id.$which"}) { @@ -240,36 +384,94 @@ sub file_submission { } } +sub delete_form_items { + my ($jspart,$id) = @_; + &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}); + &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'}); + &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); +} + + sub check_collaborators { my ($ncol,$coll) = @_; my %classlist=&Apache::lonnet::dump('classlist', $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); my (@badcollaborators,$result); - my (@collaborators) = split(/\,?\s+/,$coll); - foreach (@collaborators) { - my $collaborator = $_; - if (/@/) { - $collaborator =~ s/@/:/; + + my (@collaborators) = split(/,?\s+/,$coll); + foreach my $entry (@collaborators) { + my $collaborator; + if ($entry =~ /:/) { + $collaborator = $entry; } else { - $collaborator = $_.':'.$env{'user.domain'}; + $collaborator = $entry.':'.$env{'user.domain'}; } - push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist); + if ($collaborator !~ /^$match_username:$match_domain$/) { + if (!grep(/^\Q$entry\E$/,@badcollaborators)) { + push(@badcollaborators,$entry); + } + } elsif (!grep(/^\Q$collaborator\E$/i,keys(%classlist))) { + if (!grep(/^\Q$entry\E$/,@badcollaborators)) { + push(@badcollaborators,$entry); + } + } } - if (scalar(@badcollaborators)) { - $result = '
    The following user'. - (scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '. - join(', ',@badcollaborators).'. Please correct.
    '; + my $numbad = scalar(@badcollaborators); + if ($numbad) { + $result = '
    '; + if ($numbad == 1) { + $result .= &mt('The following user is invalid:'); + } else { + $result .= &mt('The following [_1] users are invalid:',$numbad); + } + $result .= ' '.join(', ',@badcollaborators).'. '.&mt('Please correct.'). + '
    '; } my $toomany = scalar(@collaborators) - $ncol; if ($toomany > 0) { $result .= '
    '. - 'You have too many collaborators. Please remove '.$toomany.' collaborator'. - ($toomany > 1 ? 's' :'').'.
    '; + &mt('You have too many collaborators.').' '. + &mt('Please remove [quant,_1,collaborator].',$toomany). + ''; } return $result; } 1; __END__ + + +=pod + +=head1 NAME + +Apache::easyresponse + +=head1 SYNOPSIS + +Handler to evaluate essay (ungraded) style responses. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 SUBROUTINES + +=over + +=item start_essayresponse() + +=item end_essayresponse() + +=item format_prior_response() + +=item file_submission() + +=item delete_form_items() + +=item check_collaborators() + +=back + +=cut