version 1.74, 2006/09/21 21:23:19
|
version 1.122, 2014/12/06 20:08:16
|
Line 29
|
Line 29
|
package Apache::essayresponse; |
package Apache::essayresponse; |
use strict; |
use strict; |
use Apache::lonxml(); |
use Apache::lonxml(); |
|
use Apache::lonhtmlcommon; |
|
use Apache::loncommon; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::lonnavmaps; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use lib '/home/httpd/lib/perl/'; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA; |
|
|
|
|
|
BEGIN { |
BEGIN { |
Line 45 sub start_essayresponse {
|
Line 47 sub start_essayresponse {
|
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('essayresponse'); |
$result=&Apache::response::meta_package_write('essayresponse'); |
} elsif ($target eq 'web' && |
} elsif ($target eq 'web') { |
$Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $part= $Apache::inputtags::part; |
my $part= $Apache::inputtags::part; |
my $coll; |
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); |
if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) { |
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
$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::inputtags::status[-1] eq 'CAN_ANSWER') { |
$result='<br /><table border="1">'; |
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators"); |
$result.='<tr><td>'. |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
'<label>'. |
$uploadedfiletypes=~s/[^\w\,]//g; |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '. |
my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize"); |
&mt('Submit entries below as answer to receive credit'). |
if (!defined($maxfilesize)) { |
'</label> <br />'. |
$maxfilesize = 10.0; #FIXME This should become a domain configuration |
'<label>'. |
} |
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. |
my $hiddendraft; |
&mt('Save entries below as a draft answer (not submitting them for credit yet)'). |
if (($Apache::lonhomework::type eq 'survey') || |
'</label>'. |
($Apache::lonhomework::type eq 'surveycred') || |
' </td></tr>'; |
($Apache::lonhomework::type eq 'anonsurvey') || |
if ($ncol > 0) { |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
$result .='<tr><td>'.'<label>'. |
$hiddendraft = '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />'; |
'Collaborators: <input type="text" size="70" max="80" name="HWCOL'. |
} else { |
$part.'_'.$id.'" value="'.$coll.'" /><br />'. |
$result = &draft_row($part,$id,$ncol,$uploadedfiletypes); |
&mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$env{'user.domain'}). |
} |
'</label><br />'; |
if ($ncol > 0) { |
$result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
$result .= &get_collab_row($part,$id,$coll,$ncol); |
$result .='</td></tr>'; |
} |
} |
my $filesfrom = 'both'; |
$result.=&Apache::inputtags::file_selector($part,$id, |
my $stuname = &Apache::lonnet::EXT('user.name'); |
$uploadedfiletypes,'both'); |
my $studom = &Apache::lonnet::EXT('user.domain'); |
$result.='</table>'; |
if (!&Apache::lonnet::usertools_access($stuname,$studom,'portfolio')) { |
} elsif ($target eq 'web' && |
$filesfrom = 'uploadonly'; |
$Apache::inputtags::status[-1] ne 'CAN_ANSWER') { |
} |
my $part= $Apache::inputtags::part; |
$result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes, |
my @msgs; |
$filesfrom,undef,$maxfilesize); |
if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) { |
if ($result) { |
my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"'); |
$result = |
$result .= '<td>'.&mt('Collaborated with [_1]',$coll).'</td>'; |
'<div>'.$hiddendraft. |
} |
&Apache::lonhtmlcommon::start_pick_box(). |
|
$result. |
|
&Apache::lonhtmlcommon::end_pick_box().'</div>'; |
|
} else { |
|
$result = $hiddendraft; |
|
} |
|
} else { |
|
$result = &show_status_table($part,$id,$coll); |
|
} |
|
} |
|
return $result; |
|
} |
|
|
my $file_submission = |
sub draft_row { |
&Apache::inputtags::show_past_file_submission($part,$id); |
my ($part,$id,$ncol,$uploadedfiletypes) = @_; |
if ($file_submission) { |
my $status_text = &mt('Submission type'); |
$result .= '<td>'.$file_submission.'</td>'; |
if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') { |
} |
$status_text .= '<br />'.&mt('(Currently -- draft)'); |
|
} |
|
my $closure; |
|
unless ($ncol || $uploadedfiletypes) { |
|
$closure = 1; |
|
} |
|
return &Apache::lonhtmlcommon::row_title($status_text). |
|
'<label>'. |
|
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" />'. |
|
' '.&mt('Submit entries below as answer to receive credit').'</label> <br />'. |
|
'<label>'. |
|
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '. |
|
&mt('Save entries below (not submitted for credit yet)'). |
|
'</label>'. |
|
&Apache::lonhtmlcommon::row_closure($closure); |
|
} |
|
|
my $port_submission = |
sub get_collab_row { |
&Apache::inputtags::show_past_portfile_submission($part,$id); |
my ($part,$id,$coll,$ncol,$closure) = @_; |
if ($port_submission) { |
my $output = &Apache::lonhtmlcommon::row_title(&mt('Collaborators')). |
$result .= '<td>'.$port_submission.'</td>'; |
'<label>'. |
} |
&mt('Collaborators:').' <input type="text" size="70" max="80" name="HWCOL'. |
|
$part.'_'.$id.'" value="'.$coll.'" /><br />'. |
|
&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) { |
|
$output .= '<br />'.&mt('If entering more than one, use spaces to separate the collaborators.'); |
|
} |
|
$output .= '</label><br />'; |
|
$output .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/); |
|
$output .= &Apache::lonhtmlcommon::row_closure($closure); |
|
return $output; |
|
} |
|
|
if ($result ne '') { |
sub show_status_table { |
$result = |
my ($part,$id,$coll) = @_; |
'<table class="LC_pastsubmission"><tr>'.$result. |
my $output; |
'</tr></table>'; |
if ($coll) { |
} |
$output = '<td><i>'.&mt('Collaborated with [_1]',$coll).'</i></td>'; |
} |
} |
return $result; |
my $current_files_display = &Apache::inputtags::current_file_submissions($part,$id); |
|
if ($current_files_display) { |
|
$output .= '<td><b>'.&mt('Submitted files:').'</b><br />'. |
|
$current_files_display.'</td>'; |
|
} |
|
if ($output ne '') { |
|
return '<table class="LC_pastsubmission"><tr>'.$output. |
|
'</tr></table>'; |
|
} |
|
return; |
} |
} |
|
|
sub end_essayresponse { |
sub end_essayresponse { |
Line 112 sub end_essayresponse {
|
Line 160 sub end_essayresponse {
|
my $increment = &Apache::response::repetition(); |
my $increment = &Apache::response::repetition(); |
my $result; |
my $result; |
if ( $target eq 'grade' ) { |
if ( $target eq 'grade' ) { |
my $collaborators = $env{'form.HWCOL'.$part.'_'.$id}; |
&get_collaborators($part,$id); |
if ($collaborators =~ /[^\s]/) { |
# Scantron |
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); |
|
} |
|
if ( &Apache::response::submitted('scantron') ) { |
if ( &Apache::response::submitted('scantron') ) { |
$increment=&Apache::response::scored_response($part,$id); |
$increment=&Apache::response::scored_response($part,$id); |
} elsif ( &Apache::response::submitted() ) { |
} elsif ( &Apache::response::submitted() ) { |
my $response = $env{'form.HWVAL_'.$id}; |
my $response = $env{'form.HWVAL_'.$id}; |
my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'}; |
my $jspart=$part; |
my $portfiles = $env{'form.HWPORT'.$part.'_'.$id}; |
$jspart=~s/\./_/g; |
if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) { |
my $filename = $env{'form.HWFILE'.$jspart.'_'.$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 $award='DRAFT'; |
if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') { |
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 $uploadedflag=0; |
&file_submission($part,$id,'filename',\$award,\$uploadedflag); |
my $totalsize=0; |
&file_submission($part,$id,'portfiles',\$award,\$uploadedflag); |
&file_submission($part,$id,\$award,\$uploadedflag,\$totalsize,\@deletions); |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award; |
my %previous=&Apache::response::check_for_previous($response,$part,$id); |
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 |
# Store with resource author for similarity testing |
# |
# |
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
my ($symb,$crsid,$domain,$name)= |
my ($symb,$crsid,$domain,$name)= |
&Apache::lonxml::whichuser(); |
&Apache::lonnet::whichuser(); |
if ($crsid) { |
if ($crsid) { |
my $akey=$name.'.'.$domain.'.'.$crsid; |
my $akey=join('.',&escape($name),&escape($domain), |
|
&escape($crsid)); |
my $essayurl= |
my $essayurl= |
&Apache::lonnet::declutter($ENV{'REQUEST_URI'}); |
&Apache::lonnet::declutter($ENV{'REQUEST_URI'}); |
my ($adom,$aname,$apath)= |
my ($adom,$aname,$apath)= |
($essayurl=~/^(\w+)\/(\w+)\/(.*)$/); |
($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/); |
$apath=&escape($apath); |
$apath=&escape($apath); |
$apath=~s/\W/\_/gs; |
$apath=~s/\W/\_/gs; |
&Apache::lonnet::put('nohist_essay_'.$apath, |
&Apache::lonnet::put('nohist_essay_'.$apath, |
{ $akey => $response },$adom,$aname); |
{ $akey => $response },$adom,$aname); |
} |
} |
} |
} |
} |
} |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
Line 165 sub end_essayresponse {
|
Line 236 sub end_essayresponse {
|
|
|
} elsif ($target eq 'answer') { |
} elsif ($target eq 'answer') { |
$result.=&Apache::response::answer_header($$tagstack[-1]); |
$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]); |
$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' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$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'; |
|
push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); |
|
&Apache::lonhomework::set_bubble_lines(); |
|
} |
} |
} |
&Apache::response::end_response; |
&Apache::response::end_response; |
|
|
return $result; |
return $result; |
} |
} |
|
|
|
sub get_collaborators { |
|
my ($part,$id) = @_; |
|
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::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators; |
|
} |
|
} |
|
|
|
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.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'. |
|
&Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file. |
|
'</a></span></li>'."\n"; |
|
} |
|
if ($file_list) { |
|
$output.= &mt('Submitted Files').'<ul>'.$file_list.'</ul>'; |
|
} |
|
if ($answer =~ /\S/) { |
|
$output.='<p>'.&mt('Submitted text'). |
|
'<blockquote>'.&HTML::Entities::encode($answer, '"<>&').'</blockquote></p>'; |
|
} |
|
|
|
return '<div class="LC_prior_essay">'.$output.'</div>'; |
|
} |
|
|
sub file_submission { |
sub file_submission { |
my ($part,$id,$which,$award,$uploadedflag)=@_; |
my ($part,$id,$award,$uploadedflag,$totalsize,$deletions,$context,$info)=@_; |
my $files; |
my $files; |
my $jspart=$part; |
my $jspart=$part; |
$jspart=~s/\./_/g; |
$jspart=~s/\./_/g; |
if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; } |
my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); |
if ($which eq 'filename') { |
my %crsinfo = &Apache::lonnet::coursedescription($crsid); |
$files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; |
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 '') { |
if ($files =~ /[^\s]/) { |
my $newfiles= $env{'form.HWPORT'.$jspart.'_'.$id}; |
$files =~s/,$//; |
$newfiles =~s/,$//; |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files; |
if ($newfiles =~ /[^\s]/) { |
|
foreach my $file (split(/\s*,\s*/,$newfiles)) { |
my @submitted_files = ($files); |
if ($file =~ /[^\s]/) { |
if ( $which eq 'portfiles' ) { |
push(@submitted_portfiles,$file); |
@submitted_files = split(/\s*,\s*/,$files); |
} |
} |
} |
|
} |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
} |
if ($uploadedfiletypes) { |
if ($env{'form.HWFILETOOBIG'.$part.'_'.$id} ne '') { |
$uploadedfiletypes=~s/[^\w\,]//g; |
$$award = 'EXCESS_FILESIZE'; |
$uploadedfiletypes=','.$uploadedfiletypes.','; |
} elsif ($env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} ne '') { |
foreach my $file (@submitted_files) { |
my $newfile = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; |
my ($extension)=($file=~/\.(\w+)$/); |
if ($newfile =~ /[^\s]/) { |
unless ($uploadedfiletypes=~/\,$extension\,/i) { |
$submitted_upload = $newfile; |
$$award='INVALID_FILETYPE'; |
} |
} |
} |
} |
if (@savedportfiles) { |
} |
foreach my $file (reverse(@savedportfiles)) { |
if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { |
unless(grep(/^\Q$file\E$/,@submitted_portfiles)) { |
$$uploadedflag=1; |
unshift(@submitted_portfiles,$file); |
} |
} |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { |
} |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
} |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
if (@submitted_portfiles || $submitted_upload) { |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]); |
my $uploadedfiletypes= |
&Apache::lonnet::clear_selected_files($name); |
&Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
} |
if ($uploadedfiletypes ne '') { |
if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') { |
$uploadedfiletypes=~s/[^\w\,]//g; |
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= |
$uploadedfiletypes=','.$uploadedfiletypes.','; |
$files; |
if (@submitted_portfiles) { |
$Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
foreach my $file (@submitted_portfiles) { |
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, |
my ($extension)=($file=~/\.(\w+)$/); |
'essayresponse'); |
if ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) { |
} |
push(@acceptable_portfiles,$file); |
} elsif ($which eq 'portfiles' && |
} |
$Apache::lonhomework::history{"resource.$part.$id.$which"}) { |
} |
my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
} |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
if ($submitted_upload) { |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=""; |
my ($upload_ext)=($submitted_upload=~/\.(\w+)$/); |
|
if ($uploadedfiletypes=~/\,\s*\Q$upload_ext\E\s*\,/i) { |
|
$acceptable_upload = $submitted_upload; |
|
} else { |
|
$$award='INVALID_FILETYPE'; |
|
&delete_form_items($jspart,$id); |
|
} |
|
} |
|
} else { |
|
@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; |
|
if (@acceptable_portfiles) { |
|
foreach my $file (@acceptable_portfiles) { |
|
my ($path,$filename) = ($file =~ m{^(.*/)([^/]+)$}); |
|
my $fullpath = '/userfiles/portfolio'.$path; |
|
if (!exists($dirlist{$fullpath})) { |
|
my ($listref,$listerror) = |
|
&Apache::lonnet::dirlist($fullpath,$udom,$uname,1); |
|
if (ref($listref) eq 'ARRAY') { |
|
$dirlist{$fullpath} = $listref; |
|
} |
|
} |
|
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); |
|
if ($filename eq $fname) { |
|
my $mbsize = $size/(1024.0*1024.0); |
|
if (ref($totalsize)) { |
|
$$totalsize += $mbsize; |
|
} |
|
last; |
|
} |
|
} |
|
} |
|
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}); |
|
} else { |
|
$accepted_upload = $acceptable_upload; |
|
} |
|
} else { |
|
$accepted_upload = $acceptable_upload; |
|
} |
|
} |
} |
} |
|
if ($accepted_upload ne '') { |
|
my ($path,$multiresp) = |
|
&Apache::loncommon::get_turnedin_filepath($symb,$uname,$udom, |
|
'submission'); |
|
if ($path eq '') { |
|
$$award = 'INTERNAL_ERROR'; |
|
} else { |
|
if ($multiresp) { |
|
$path .= '/'.$jspart.'_'.$id; |
|
} |
|
my $prefix = 'portfolio'; |
|
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); |
|
my $conflicts = 0; |
|
if (@stat && $stat[0] ne 'no_such_dir') { |
|
my $current_permissions = |
|
&Apache::lonnet::get_portfile_permissions($udom,$uname); |
|
if (ref($current_permissions) eq 'HASH') { |
|
if (ref($current_permissions->{$path.'/'.$fname}) eq 'ARRAY') { |
|
foreach my $record (@{$current_permissions->{$path.'/'.$fname}}) { |
|
if (ref($record) eq 'ARRAY') { |
|
next if (($record->[0] eq $symb) && |
|
($record->[1] eq $crsid)); |
|
$conflicts ++; |
|
} |
|
} |
|
} |
|
} |
|
if ($conflicts) { |
|
$$award = 'FILENAME_INUSE'; |
|
} |
|
} |
|
unless ($conflicts) { |
|
my ($mode,%allfiles,%codebase); |
|
my $result = &Apache::lonnet::userfileupload($formelement,'', |
|
$prefix.$path,$mode,\%allfiles,\%codebase); |
|
if ($result =~ m{^/uploaded/}) { |
|
$stored_upload = $path.'/'.$fname; |
|
unless (grep(/^\Q$stored_upload\E$/,@accepted_portfiles)) { |
|
$Apache::lonhomework::results{"resource.$part.$id.portfiles"} = $stored_upload; |
|
push(@tolock,$stored_upload); |
|
} |
|
} else { |
|
$$award = 'INTERNAL_ERROR'; |
|
} |
|
} |
|
} |
|
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
|
} |
|
if (@accepted_portfiles) { |
|
if ($Apache::lonhomework::results{"resource.$part.$id.portfiles"}) { |
|
$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; |
|
} |
|
} |
|
if ($context eq 'externalresponse') { |
|
my @todelete = map { "/uploaded/$udom/$uname/portfolio".$_; } keys(%port_delete); |
|
if (@tolock || @todelete) { |
|
if (ref($info) eq 'HASH') { |
|
if (($info->{'ip'}) && ($info->{'is_submit'})) { |
|
my @adds; |
|
if (@tolock) { |
|
@adds = map { "/uploaded/$udom/$uname/portfolio".$_; } @tolock; |
|
} |
|
&Apache::lonnet::automated_portfile_access('ip',\@adds,\@todelete,$info); |
|
} |
|
} |
|
} |
|
} |
|
&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 { |
|
my ($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 { |
sub check_collaborators { |
Line 238 sub check_collaborators {
|
Line 563 sub check_collaborators {
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
my (@badcollaborators,$result); |
my (@badcollaborators,$result); |
my (@collaborators) = split(/\,?\s+/,$coll); |
|
foreach (@collaborators) { |
my (@collaborators) = split(/[,;\s]+/,$coll); |
my $collaborator = $_; |
foreach my $entry (@collaborators) { |
if (/@/) { |
my $collaborator; |
$collaborator =~ s/@/:/; |
if ($entry =~ /:/) { |
|
$collaborator = $entry; |
} else { |
} 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)) { |
my $numbad = scalar(@badcollaborators); |
$result = '<table border="0"><tr bgcolor="#ffbbbb"><td> The following user'. |
if ($numbad) { |
(scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '. |
$result = '<table border="0"><tr bgcolor="#ffbbbb"><td>'; |
join(', ',@badcollaborators).'. Please correct.</td></tr></table>'; |
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.'). |
|
'</td></tr></table>'; |
} |
} |
my $toomany = scalar(@collaborators) - $ncol; |
my $toomany = scalar(@collaborators) - $ncol; |
if ($toomany > 0) { |
if ($toomany > 0) { |
$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'. |
$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'. |
'You have too many collaborators. Please remove '.$toomany.' collaborator'. |
&mt('You have too many collaborators.').' '. |
($toomany > 1 ? 's' :'').'.</td></tr></table>'; |
&mt('Please remove [quant,_1,collaborator].',$toomany). |
|
'</td></tr></table>'; |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|
|
|
|
=pod |
|
|
|
=head1 NAME |
|
|
|
Apache::essayresponse |
|
|
|
=head1 SYNOPSIS |
|
|
|
Handler to evaluate essay (ungraded) style responses. |
|
|
|
This is part of the LearningOnline Network with CAPA project |
|
described at http://www.lon-capa.org. |
|
|
|
=head1 SUBROUTINES |
|
|
|
=over |
|
|
|
=item start_essayresponse() |
|
|
|
=item draft_row() |
|
|
|
=item get_collab_row() |
|
|
|
=item show_status_table() |
|
|
|
=item end_essayresponse() |
|
|
|
=item get_collaborators() |
|
|
|
=item format_prior_response() |
|
|
|
=item file_submission() |
|
|
|
=item delete_form_items() |
|
|
|
=item check_collaborators() |
|
|
|
=back |
|
|
|
=cut |