--- loncom/homework/essayresponse.pm 2008/11/20 14:37:37 1.92 +++ loncom/homework/essayresponse.pm 2010/06/17 00:13:20 1.107 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.92 2008/11/20 14:37:37 jms Exp $ +# $Id: essayresponse.pm,v 1.107 2010/06/17 00:13:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,11 +51,21 @@ 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; - if ( $Apache::lonhomework::type eq 'survey' ) { + 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') || + ($Apache::lonhomework::type eq 'surveycred') || + ($Apache::lonhomework::type eq 'anonsurvey') || + ($Apache::lonhomework::type eq 'anonsurveycred')) { $result.= ' '; } $result.='
'; - if ( $Apache::lonhomework::type ne 'survey' ) { + if (($Apache::lonhomework::type ne 'survey') && + ($Apache::lonhomework::type ne 'surveycred') && + ($Apache::lonhomework::type ne 'anonsurvey') && + ($Apache::lonhomework::type ne 'anonsurveycred')) { $result.= ''; } @@ -80,8 +90,14 @@ sub start_essayresponse { $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') { @@ -89,7 +105,7 @@ sub start_essayresponse { my @msgs; if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) { my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); - $result .= ''.&mt('Collaborated with [_1]',$coll).''; + $result .= ''.&mt('Collaborated with [_1]',$coll).''; } my $file_submission = @@ -120,12 +136,14 @@ sub end_essayresponse { my $increment = &Apache::response::repetition(); 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"},'<>&"'); - $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators - if ($collaborators ne $previous_list); - } +# Deal with collaborators + my $collaborators = $env{'form.HWCOL'.$part.'_'.$id}; + my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); + if ($collaborators ne $previous_list) { +# &Apache::lonnet::logthis("New collaborators [$collaborators] [$previous_list]"); + $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators; + } +# Scantron if ( &Apache::response::submitted('scantron') ) { $increment=&Apache::response::scored_response($part,$id); } elsif ( &Apache::response::submitted() ) { @@ -136,7 +154,15 @@ sub end_essayresponse { if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { my $award='DRAFT'; if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { - $award='SUBMITTED'; + if ($Apache::lonhomework::type eq 'anonsurvey') { + $award='ANONYMOUS'; + } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { + $award='ANONYMOUS_CREDIT'; + } elsif ($Apache::lonhomework::type eq 'surveycred') { + $award='SUBMITTED_CREDIT'; + } else { + $award='SUBMITTED'; + } } my $uploadedflag=0; my $totalsize=0; @@ -145,7 +171,13 @@ sub end_essayresponse { $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); - unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); } + if ($uploadedflag) { + if ($award eq 'FILENAME_INUSE') { + delete($Apache::lonhomework::results{"resource.$id.tries"}); + } + } else { + &Apache::response::handle_previous(\%previous,$award); + } # # Store with resource author for similarity testing # @@ -193,6 +225,7 @@ sub end_essayresponse { if ($target eq 'analyze') { $Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse'; + push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); &Apache::lonhomework::set_bubble_lines(); } } @@ -246,6 +279,7 @@ sub file_submission { $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; } } + my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); if ($files =~ /[^\s]/) { $files =~s/,$//; my (@submitted_files,@acceptable_files,@accepted_files); @@ -256,7 +290,7 @@ sub file_submission { } my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); - if ($uploadedfiletypes) { + if ($uploadedfiletypes ne '') { $uploadedfiletypes=~s/[^\w\,]//g; $uploadedfiletypes=','.$uploadedfiletypes.','; foreach my $file (@submitted_files) { @@ -270,10 +304,12 @@ sub file_submission { } } } + } else { + @acceptable_files = @submitted_files; } my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); if (!$maxfilesize) { - $maxfilesize = 100.0; #FIXME This should become a domain configuration + $maxfilesize = 10.0; #FIXME This should become a domain configuration } my %dirlist; foreach my $file (@acceptable_files) { @@ -282,12 +318,14 @@ sub file_submission { $$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; } } else { - my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); - my ($path,$filename) = ($file =~ m{^(.+)/([^/]+)$}); + 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) { + $dirlist{$fullpath} = \@list; + } + if (ref($dirlist{$fullpath}) eq 'ARRAY') { + foreach my $dir_line (@{$dirlist{$fullpath}}) { my ($fname,$dom,undef,$testdir,undef,undef,undef,undef, $size,undef,$mtime,undef,undef,undef,$obs,undef) = split(/\&/,$dir_line,16); @@ -299,7 +337,6 @@ sub file_submission { last; } } - $dirlist{$fullpath} = \@list; } } if (ref($totalsize)) { @@ -308,49 +345,137 @@ sub file_submission { if ($which eq 'filename') { &delete_form_items($jspart,$id); } + last; + } else { + push(@accepted_files,$file); } } else { push(@accepted_files,$file); } } - my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); - $Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); - if (($$award eq 'INVALID_FILETYPE') || ($award eq 'EXCESS_FILESIZE')) { + if ($which eq 'portfiles') { + my @to_mark; + if ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}) { + @to_mark = ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}); + } + if (@accepted_files) { + if ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}) { + $Apache::lonhomework::results{"resource.$part.$id.$which"} .= ','; + } + $Apache::lonhomework::results{"resource.$part.$id.$which"}.=join(',',@accepted_files); + push(@to_mark,@accepted_files); + } + &Apache::lonnet::unmark_as_readonly($udom,$uname,[$symb,$crsid]); + &Apache::lonnet::mark_as_readonly($udom,$uname,\@to_mark,[$symb,$crsid]); + &Apache::lonnet::clear_selected_files($uname); + } + if (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) { + if ($which eq 'filename') { + delete($env{'form.HWFILE'.$jspart.'_'.$id}); + } return; } if (ref($uploadedflag)) { $$uploadedflag=1; } - if ($which eq 'portfiles') { - 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); - } if ($which eq 'filename') { - $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= - $files; - $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= - &Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, - 'essayresponse'); - &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); - } - } elsif ($which eq 'portfiles' && - $Apache::lonhomework::history{"resource.$part.$id.$which"}) { - my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); - &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); - $Apache::lonhomework::results{"resource.$part.$id.$which"}=""; + my $cleanpart = $part; + $cleanpart =~ s/\W/_/g; + my $cleanid = $id; + $cleanid =~ s/\W/_/g; + my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb); + my %crsdesc = &Apache::lonnet::coursedescription($crsid); + my $turnindir; + my %userhash = &Apache::lonnet::userenvironment($udom,$uname,'turnindir'); + $turnindir = $userhash{'turnindir'}; + if ($turnindir eq '') { + $turnindir = &mt('turned in'); + $turnindir =~ s/\W+/_/g; + my %newhash = ( + 'turnindir' => $turnindir, + ); + &Apache::lonnet::put('environment',\%newhash,$udom,$uname); + } + my $prefix = 'portfolio'; + my $path = '/'.$turnindir.'/'; + my $crsname = $crsdesc{'description'}; + my $restitle=&Apache::lonnet::gettitle($symb); + foreach my $item ($crsname,$restitle) { + $item =~ s/\W+/_/g; + } + if ($crsname eq '') { + $crsname = $crsid; + } + if ($restitle eq '') { + $restitle = ($resurl =~ m{/[^/]+$}); + if ($restitle eq '') { + $restitle = time; + } + } + my @pathitems; + my $navmap = Apache::lonnavmaps::navmap->new(); + if (defined($navmap)) { + my $mapres = $navmap->getResourceByUrl($map); + if (ref($mapres)) { + my $pcslist = $mapres->map_hierarchy(); + if ($pcslist ne '') { + foreach my $pc (split(/,/,$pcslist)) { + my $res = $navmap->getByMapPc($pc); + if (ref($res)) { + my $title = $res->compTitle(); + $title =~ s/\W+/_/g; + if ($title ne '') { + push(@pathitems,$title); + } + } + } + } + my $maptitle = $mapres->compTitle(); + $maptitle =~ s/\W+/_/g; + if ($maptitle ne '') { + push(@pathitems,$maptitle); + } + } else { + $$award = 'INTERNAL_ERROR'; + } + } else { + $$award = 'INTERNAL_ERROR'; + } + push(@pathitems,$restitle); + unshift(@pathitems,$crsname); + $path .= join('/',@pathitems); + my $formelement = 'HWFILE'.$jspart.'_'.$id; + my $fname = $env{'form.'.$formelement.'.filename'}; + &Apache::lonnet::clean_filename($fname); + my $url = '/uploaded/'.$udom.'/'.$uname.'/'.$prefix.$path.'/'.$fname; + my @stat = &Apache::lonnet::stat_file($url); + if (@stat && $stat[0] ne 'no_such_dir') { + $$award = 'FILENAME_INUSE'; + } else { + my ($mode,%allfiles,%codebase); + my $result = &Apache::lonnet::userfileupload($formelement,'', + $prefix.$path,$mode,\%allfiles,\%codebase); + if ($result =~ m{^/uploaded/}) { + $Apache::lonhomework::results{"resource.$part.$id.portfiles"} .= $path.'/'.$fname; + &Apache::lonnet::unmark_as_readonly($udom,$uname,[$symb,$crsid]); + + &Apache::lonnet::mark_as_readonly($udom,$uname,[$path.'/'.$fname],[$symb,$crsid]); + } else { + $$award = 'INTERNAL_ERROR'; + } + } + delete($env{'form.HWFILE'.$jspart.'_'.$id}); + } } } 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}); + delete($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}); + delete($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'}); + delete($env{'form.HWFILE'.$jspart.'_'.$id}); } - sub check_collaborators { my ($ncol,$coll) = @_; my %classlist=&Apache::lonnet::dump('classlist', @@ -358,7 +483,7 @@ sub check_collaborators { $env{'course.'.$env{'request.course.id'}.'.num'}); my (@badcollaborators,$result); - my (@collaborators) = split(/,?\s+/,$coll); + my (@collaborators) = split(/[,;\s]+/,$coll); foreach my $entry (@collaborators) { my $collaborator; if ($entry =~ /:/) { @@ -406,7 +531,7 @@ __END__ =head1 NAME -Apache::easyresponse +Apache::essayresponse =head1 SYNOPSIS @@ -433,4 +558,4 @@ described at http://www.lon-capa.org. =back -=cut \ No newline at end of file +=cut