--- loncom/homework/essayresponse.pm 2008/11/20 14:37:37 1.92 +++ loncom/homework/essayresponse.pm 2010/04/19 04:20:25 1.104 @@ -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.104 2010/04/19 04:20:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,6 +41,8 @@ BEGIN { sub start_essayresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; + print STDERR "target is $target AND status is ".$Apache::inputtags::status[-1]." AND ". + " type is ".$Apache::lonhomework::type."\n"; my $id = &Apache::response::start_response($parstack,$safeeval); if ($target eq 'meta') { $result=&Apache::response::meta_package_write('essayresponse'); @@ -51,11 +53,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 +92,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') { @@ -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; @@ -193,6 +219,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(); } } @@ -256,7 +283,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 +297,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) { @@ -283,11 +312,14 @@ sub file_submission { } } 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 +331,6 @@ sub file_submission { last; } } - $dirlist{$fullpath} = \@list; } } if (ref($totalsize)) { @@ -308,21 +339,23 @@ 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 (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) { return; } if (ref($uploadedflag)) { $$uploadedflag=1; } + my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); 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); @@ -330,10 +363,40 @@ sub file_submission { 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'); - &Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); + $subdir); + delete($env{'form.HWFILE'.$jspart.'_'.$id}); } } elsif ($which eq 'portfiles' && $Apache::lonhomework::history{"resource.$part.$id.$which"}) { @@ -345,9 +408,9 @@ 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}); + delete($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}); + delete($env{'form.HWFILE'.$jspart.'_'.$id.'.mimetype'}); + delete($env{'form.HWFILE'.$jspart.'_'.$id}); } @@ -433,4 +496,4 @@ described at http://www.lon-capa.org. =back -=cut \ No newline at end of file +=cut