--- loncom/homework/essayresponse.pm 2010/06/17 00:13:20 1.107 +++ loncom/homework/essayresponse.pm 2010/06/21 02:15:37 1.108 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.107 2010/06/17 00:13:20 raeburn Exp $ +# $Id: essayresponse.pm,v 1.108 2010/06/21 02:15:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,7 +29,10 @@ 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); @@ -59,27 +62,37 @@ sub start_essayresponse { ($Apache::lonhomework::type eq 'surveycred') || ($Apache::lonhomework::type eq 'anonsurvey') || ($Apache::lonhomework::type eq 'anonsurveycred')) { - $result.= ' '; + $result.= ''; } - $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(). + &Apache::lonhtmlcommon::row_title($status_text); if (($Apache::lonhomework::type ne 'survey') && ($Apache::lonhomework::type ne 'surveycred') && ($Apache::lonhomework::type ne 'anonsurvey') && ($Apache::lonhomework::type ne 'anonsurveycred')) { - $result.= '

'; + &Apache::lonhtmlcommon::row_closure($closure); } if ($ncol > 0) { - $result .=''; + $result .= &Apache::lonhtmlcommon::row_closure(); } my $filesfrom = 'both'; my $stuname = &Apache::lonnet::EXT('user.name'); @@ -98,7 +111,7 @@ sub start_essayresponse { } $result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes, $filesfrom,undef,$maxfilesize); - $result.='
'. + my $closure; + unless ($ncol || $uploadedfiletypes) { + $closure = 1; + } + $result.= '
'. ''. - '
'.'
'; + $result.=&Apache::lonhtmlcommon::end_pick_box().'

'; } elsif ($target eq 'web' && $Apache::inputtags::status[-1] ne 'CAN_ANSWER') { my $part= $Apache::inputtags::part; @@ -108,17 +121,11 @@ sub start_essayresponse { $result .= ''.&mt('Collaborated with [_1]',$coll).''; } - 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.''; - } + my $current_files_display = ¤t_file_submissions($part,$id); + if ($current_files_display) { + $result .= ''.&mt('Submitted files:').'
'. + $current_files_display.''; + } if ($result ne '') { $result = @@ -151,7 +158,16 @@ sub end_essayresponse { 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 @deletions = &Apache::loncommon::get_env_multiple('form.HWFILE'.$part.'_'.$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'; if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { if ($Apache::lonhomework::type eq 'anonsurvey') { @@ -166,8 +182,7 @@ sub end_essayresponse { } my $uploadedflag=0; my $totalsize=0; - &file_submission($part,$id,'filename',\$award,\$uploadedflag,\$totalsize); - &file_submission($part,$id,'portfiles',\$award,\$uploadedflag,\$totalsize); + &file_submission($part,$id,\$award,\$uploadedflag,\$totalsize,\@deletions); $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); @@ -197,7 +212,7 @@ sub end_essayresponse { { $akey => $response },$adom,$aname); } } - } + } } } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); @@ -265,59 +280,108 @@ sub format_prior_response { } sub file_submission { - my ($part,$id,$which,$award,$uploadedflag,$totalsize)=@_; + my ($part,$id,$award,$uploadedflag,$totalsize,$deletions)=@_; my $files; my $jspart=$part; $jspart=~s/\./_/g; - 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'}; + 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; + } + } + } + } + foreach my $current (@portfiles) { + unless ($port_delete{$current}) { + push(@savedportfiles,$current); + } + } + if ($uploaded_delete) { + $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"} = ""; + $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"} = ""; } } - my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); - 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 ($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); + } + } } - my $uploadedfiletypes= + } + if ($env{'form.HWFILETOOBIG'.$jspart.'_'.$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 (@savedportfiles) { + foreach my $file (reverse(@savedportfiles)) { + unless(grep(/^\Q$file\E$/,@submitted_portfiles)) { + unshift(@submitted_portfiles,$file); + } + } + } + if (@submitted_portfiles || $submitted_upload) { + my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); if ($uploadedfiletypes ne '') { $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); + 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; } else { $$award='INVALID_FILETYPE'; - if ($which eq 'filename') { - &delete_form_items($jspart,$id); - } + &delete_form_items($jspart,$id); } } } else { - @acceptable_files = @submitted_files; + @acceptable_portfiles = @submitted_portfiles; + $acceptable_upload = $submitted_upload; } + } + 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; - foreach my $file (@acceptable_files) { - if ($which eq 'filename') { - if (ref($totalsize)) { - $$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; - } - } else { + if (@acceptable_portfiles) { + foreach my $file (@acceptable_portfiles) { my ($path,$filename) = ($file =~ m{^(.*/)([^/]+)$}); my $fullpath = '/userfiles/portfolio'.$path; if (!exists($dirlist{$fullpath})) { @@ -327,7 +391,7 @@ sub file_submission { 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) = + $size,undef,$mtime,undef,undef,undef,$obs,undef) = split(/\&/,$dir_line,16); if ($filename eq $fname) { my $mbsize = $size/(1024.0*1024.0); @@ -338,135 +402,128 @@ 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'; - if ($which eq 'filename') { - &delete_form_items($jspart,$id); - } - last; + delete($env{'form.HWFILE'.$jspart.'_'.$id}); } else { - push(@accepted_files,$file); + $accepted_upload = $acceptable_upload; } } else { - push(@accepted_files,$file); + $accepted_upload = $acceptable_upload; } } - 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 ($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); } - if (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) { - if ($which eq 'filename') { - delete($env{'form.HWFILE'.$jspart.'_'.$id}); + 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; } - return; } - if (ref($uploadedflag)) { - $$uploadedflag=1; - } - if ($which eq 'filename') { - 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 @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'; + } + my $maptitle = $mapres->compTitle(); + $maptitle =~ s/\W+/_/g; + if ($maptitle ne '') { + push(@pathitems,$maptitle); } } 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 { + $$award = 'INTERNAL_ERROR'; + } + push(@pathitems,$restitle); + $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/}) { + $stored_upload = $path.'/'.$fname; + $Apache::lonhomework::results{"resource.$part.$id.portfiles"} = $stored_upload; + push(@tolock,$stored_upload); } 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'; - } + $$award = 'INTERNAL_ERROR'; } - delete($env{'form.HWFILE'.$jspart.'_'.$id}); - } + } + delete($env{'form.HWFILE'.$jspart.'_'.$id}); + } + 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"}) { + 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 {