--- loncom/homework/essayresponse.pm 2006/09/21 21:23:19 1.74 +++ loncom/homework/essayresponse.pm 2008/08/28 00:14:42 1.88 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.74 2006/09/21 21:23:19 albertel Exp $ +# $Id: essayresponse.pm,v 1.88 2008/08/28 00:14:42 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,23 +51,32 @@ 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; - $result='
'; - $result.=''; + if ( $Apache::lonhomework::type eq 'survey' ) { + $result.= ' '; + } + $result.='
'. - '
'. - ''. - '
'; + if ( $Apache::lonhomework::type ne 'survey' ) { + $result.= ''; + } + if ($ncol > 0) { $result .=''; } @@ -141,13 +149,14 @@ sub end_essayresponse { # if ($award eq 'SUBMITTED') { my ($symb,$crsid,$domain,$name)= - &Apache::lonxml::whichuser(); + &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, @@ -165,19 +174,61 @@ sub end_essayresponse { } elsif ($target eq 'answer') { $result.=&Apache::response::answer_header($$tagstack[-1]); - $result.=&Apache::response::answer_part($$tagstack[-1],''); + 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 $files; @@ -203,7 +254,7 @@ sub file_submission { $uploadedfiletypes=','.$uploadedfiletypes.','; foreach my $file (@submitted_files) { my ($extension)=($file=~/\.(\w+)$/); - unless ($uploadedfiletypes=~/\,$extension\,/i) { + unless ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) { $$award='INVALID_FILETYPE'; } } @@ -212,7 +263,7 @@ sub file_submission { $$uploadedflag=1; } if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { - my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); + my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); &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); @@ -226,7 +277,7 @@ sub file_submission { } } elsif ($which eq 'portfiles' && $Apache::lonhomework::history{"resource.$part.$id.$which"}) { - my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); + my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); $Apache::lonhomework::results{"resource.$part.$id.$which"}=""; } @@ -238,27 +289,43 @@ sub check_collaborators { $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 = '
    '. + '
    '. + ''. + '
    '.'
    '; + &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 .='
    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; }