--- loncom/homework/essayresponse.pm 2010/09/13 04:23:00 1.101.10.2 +++ loncom/homework/essayresponse.pm 2010/02/28 23:37:03 1.102 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.101.10.2 2010/09/13 04:23:00 raeburn Exp $ +# $Id: essayresponse.pm,v 1.102 2010/02/28 23:37:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,10 +29,7 @@ package Apache::essayresponse; use strict; use Apache::lonxml(); -use Apache::lonhtmlcommon; -use Apache::loncommon; use Apache::lonnet; -use Apache::lonnavmaps; use Apache::lonlocal; use LONCAPA qw(:DEFAULT :match); @@ -58,39 +55,31 @@ sub start_essayresponse { if (!defined($maxfilesize)) { $maxfilesize = 10.0; #FIXME This should become a domain configuration } - if ( $Apache::lonhomework::type eq 'survey' ) { + if (($Apache::lonhomework::type eq 'survey') || + ($Apache::lonhomework::type eq 'surveycred') || + ($Apache::lonhomework::type eq 'anonsurvey') || + ($Apache::lonhomework::type eq 'anonsurveycred')) { $result.= ' '; } - my $status_text = &mt('Submission type'); - if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { - $status_text .= '
'.&mt('(Currently -- draft)'); - } - $result.= '

'.&Apache::lonhtmlcommon::start_pick_box(); - if ( $Apache::lonhomework::type ne 'survey' ) { - if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { - - $result .= ''; - } else { - $result .= &Apache::lonhtmlcommon::row_title($status_text); - my $closure; - unless ($ncol || $uploadedfiletypes) { - $closure = 1; - } - $result.= + $result.='
'; + if (($Apache::lonhomework::type ne 'survey') && + ($Apache::lonhomework::type ne 'surveycred') && + ($Apache::lonhomework::type eq 'anonsurvey') && + ($Apache::lonhomework::type ne 'anonsurveycred')) { + $result.= ''; } + if ($ncol > 0) { - $result.= &Apache::lonhtmlcommon::row_title(&mt('Collaborators')). - ''; } my $filesfrom = 'both'; my $stuname = &Apache::lonnet::EXT('user.name'); @@ -109,21 +98,27 @@ sub start_essayresponse { } $result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes, $filesfrom,undef,$maxfilesize); - $result.=&Apache::lonhtmlcommon::end_pick_box().'

'; + $result.='
'. '
'. ''. - &Apache::lonhtmlcommon::row_closure($closure); - } + '
'.'
'; $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); - $result .= &Apache::lonhtmlcommon::row_closure(); + $result .='
'; } elsif ($target eq 'web' && $Apache::inputtags::status[-1] ne 'CAN_ANSWER') { my $part= $Apache::inputtags::part; 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 $current_files_display = &Apache::inputtags::current_file_submissions($part,$id); - if ($current_files_display) { - $result .= ''.&mt('Submitted files:').'
'. - $current_files_display.''; - } + my $file_submission = + &Apache::inputtags::show_past_file_submission($part,$id); + if ($file_submission) { + $result .= ''.$file_submission.''; + } + + my $port_submission = + &Apache::inputtags::show_past_portfile_submission($part,$id); + if ($port_submission) { + $result .= ''.$port_submission.''; + } if ($result ne '') { $result = @@ -151,38 +146,30 @@ sub end_essayresponse { $increment=&Apache::response::scored_response($part,$id); } elsif ( &Apache::response::submitted() ) { my $response = $env{'form.HWVAL_'.$id}; - my $jspart=$part; - $jspart=~s/\./_/g; - my $filename = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} || + my $filename = $env{'form.HWFILE'.$part.'_'.$id.'.filename'} || $env{'form.HWFILETOOBIG'.$part.'_'.$id}; - my $portfiles = $env{'form.HWPORT'.$jspart.'_'.$id}; - my @deletions = &Apache::loncommon::get_env_multiple('form.HWFILE'.$jspart.'_'.$id.'_delete'); - my ($is_submit,$was_draft); - if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { - $is_submit = 1; - } - if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { - $was_draft = 1; - } - if (($response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/) || - (@deletions > 0) || ($was_draft && $is_submit)) { - my $award='DRAFT'; + my $portfiles = $env{'form.HWPORT'.$part.'_'.$id}; + 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; - &file_submission($part,$id,\$award,\$uploadedflag,\$totalsize,\@deletions); + &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); - if ($uploadedflag) { - if ($award eq 'FILENAME_INUSE') { - delete($Apache::lonhomework::results{"resource.$id.tries"}); - } - } else { - &Apache::response::handle_previous(\%previous,$award); - } + unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); } # # Store with resource author for similarity testing # @@ -270,114 +257,59 @@ sub format_prior_response { } sub file_submission { - my ($part,$id,$award,$uploadedflag,$totalsize,$deletions)=@_; + my ($part,$id,$which,$award,$uploadedflag,$totalsize)=@_; my $files; my $jspart=$part; $jspart=~s/\./_/g; - my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); - my %crsinfo = &Apache::lonnet::coursedescription($crsid); - my $cdom = $crsinfo{'domain'}; - my $cnum = $crsinfo{'num'}; - my (@portfiles,$uploadedurl,@submitted_portfiles,$submitted_upload, - @acceptable_portfiles,$acceptable_upload,@accepted_portfiles, - $accepted_upload,@savedportfiles,$stored_upload,@tolock, - %port_delete,$uploaded_delete); - if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"} || - $Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}) { - if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}) { - @portfiles = split(/,/,$Apache::lonhomework::history{"resource.$part.$id.portfiles"}); - } - $uploadedurl = $Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; - if (ref($deletions) eq 'ARRAY') { - if (@{$deletions} > 0) { - foreach my $file (@{$deletions}) { - $file = &HTML::Entities::decode($file); - if (grep(/^\Q$file\E$/,@portfiles)) { - $port_delete{$file} = 1; - } elsif ($file =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/essayresponse/\Q$cdom\E/\Q$cnum\E/}) { - $uploaded_delete = $file; - } elsif ($file =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/essayresponse/[^/]+$}) { - $uploaded_delete = $file; - } - } - } - } - foreach my $current (@portfiles) { - unless ($port_delete{$current}) { - push(@savedportfiles,$current); - } - } - if ($uploaded_delete) { - if ($uploaded_delete eq $uploadedurl) { - $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"} = ""; - $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"} = ""; - } else { - undef($uploaded_delete); - } - } - } - if ($env{'form.HWPORT'.$jspart.'_'.$id} ne '') { - my $newfiles= $env{'form.HWPORT'.$jspart.'_'.$id}; - $newfiles =~s/,$//; - if ($newfiles =~ /[^\s]/) { - foreach my $file (split(/\s*,\s*/,$newfiles)) { - if ($file =~ /[^\s]/) { - push(@submitted_portfiles,$file); - } - } - } - } - if ($env{'form.HWFILETOOBIG'.$part.'_'.$id} ne '') { - $$award = 'EXCESS_FILESIZE'; - } elsif ($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} ne '') { - my $newfile = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; - if ($newfile =~ /[^\s]/) { - $submitted_upload = $newfile; + 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 (@savedportfiles) { - foreach my $file (reverse(@savedportfiles)) { - unless(grep(/^\Q$file\E$/,@submitted_portfiles)) { - unshift(@submitted_portfiles,$file); - } + if ($files =~ /[^\s]/) { + $files =~s/,$//; + my (@submitted_files,@acceptable_files,@accepted_files); + if ($which eq 'portfiles') { + @submitted_files = split(/\s*,\s*/,$files); + } else { + @submitted_files = ($files); } - } - if (@submitted_portfiles || $submitted_upload) { - my $uploadedfiletypes= + my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); if ($uploadedfiletypes ne '') { $uploadedfiletypes=~s/[^\w\,]//g; $uploadedfiletypes=','.$uploadedfiletypes.','; - if (@submitted_portfiles) { - foreach my $file (@submitted_portfiles) { - my ($extension)=($file=~/\.(\w+)$/); - if ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) { - push(@acceptable_portfiles,$file); - } - } - } - if ($submitted_upload) { - my ($upload_ext)=($submitted_upload=~/\.(\w+)$/); - if ($uploadedfiletypes=~/\,\s*\Q$upload_ext\E\s*\,/i) { - $acceptable_upload = $submitted_upload; + 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'; - &delete_form_items($jspart,$id); + if ($which eq 'filename') { + &delete_form_items($jspart,$id); + } } } } else { - @acceptable_portfiles = @submitted_portfiles; - $acceptable_upload = $submitted_upload; + @acceptable_files = @submitted_files; } - } - if ((@acceptable_portfiles) || ($acceptable_upload ne '')) { my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); if (!$maxfilesize) { $maxfilesize = 10.0; #FIXME This should become a domain configuration } my %dirlist; - if (@acceptable_portfiles) { - foreach my $file (@acceptable_portfiles) { + 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})) { @@ -398,129 +330,78 @@ sub file_submission { } } } - if (ref($totalsize)) { - if ($$totalsize > $maxfilesize) { - $$award='EXCESS_FILESIZE'; - &delete_form_items($jspart,$id); - } else { - push(@accepted_portfiles,$file); - } - } else { - push(@accepted_portfiles,$file); - } } - } - if ($acceptable_upload ne '') { if (ref($totalsize)) { - $$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; if ($$totalsize > $maxfilesize) { $$award='EXCESS_FILESIZE'; - delete($env{'form.HWFILE'.$jspart.'_'.$id}); + if ($which eq 'filename') { + &delete_form_items($jspart,$id); + } + last; } else { - $accepted_upload = $acceptable_upload; + push(@accepted_files,$file); } } else { - $accepted_upload = $acceptable_upload; + push(@accepted_files,$file); } } - } - if ($accepted_upload ne '') { - my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb); - 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 $restitle=&Apache::lonnet::gettitle($symb); - $restitle =~ s/\W+/_/g; - if ($restitle eq '') { - $restitle = ($resurl =~ m{/[^/]+$}); - if ($restitle eq '') { - $restitle = time; - } + $Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); + if (($$award eq 'INVALID_FILETYPE') || ($award eq 'EXCESS_FILESIZE')) { + return; } - 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); + if (ref($uploadedflag)) { + $$uploadedflag=1; + } + 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 ($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 { - $$award = 'INTERNAL_ERROR'; - } - } else { - $$award = 'INTERNAL_ERROR'; - } - push(@pathitems,$restitle); - $path .= join('/',@pathitems); - my $formelement = 'HWFILE'.$jspart.'_'.$id; - my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formelement.'.filename'}); - 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/}) { - $stored_upload = $path.'/'.$fname; - $Apache::lonhomework::results{"resource.$part.$id.portfiles"} = $stored_upload; - push(@tolock,$stored_upload); - } else { - $$award = 'INTERNAL_ERROR'; - } + ($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, + $subdir); + delete($env{'form.HWFILE'.$jspart.'_'.$id}); } - delete($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"}=""; } - if (@accepted_portfiles) { - if ($stored_upload) { - $Apache::lonhomework::results{"resource.$part.$id.portfiles"} .= ','; - } - $Apache::lonhomework::results{"resource.$part.$id.portfiles"}.=join(',',@accepted_portfiles); - push(@tolock,@accepted_portfiles); - } - if (!defined($Apache::lonhomework::results{"resource.$part.$id.portfiles"})) { - if (keys(%port_delete) > 0) { - $Apache::lonhomework::results{"resource.$part.$id.portfiles"} = ""; - } - } - if (($Apache::lonhomework::history{"resource.$part.$id.portfiles"} ne - $Apache::lonhomework::results{"resource.$part.$id.portfiles"}) || - ($uploaded_delete)) { - if (ref($uploadedflag)) { - $$uploadedflag=1; - } - } - &Apache::lonnet::unmark_as_readonly($udom,$uname,[$symb,$crsid]); - &Apache::lonnet::mark_as_readonly($udom,$uname,[@tolock],[$symb,$crsid]); - &Apache::lonnet::clear_selected_files($uname); - return; } sub delete_form_items { @@ -530,6 +411,7 @@ sub delete_form_items { delete($env{'form.HWFILE'.$jspart.'_'.$id}); } + sub check_collaborators { my ($ncol,$coll) = @_; my %classlist=&Apache::lonnet::dump('classlist', @@ -537,7 +419,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 =~ /:/) { @@ -585,7 +467,7 @@ __END__ =head1 NAME -Apache::essayresponse +Apache::easyresponse =head1 SYNOPSIS