version 1.106, 2010/04/22 13:00:24
|
version 1.107, 2010/06/17 00:13:20
|
Line 171 sub end_essayresponse {
|
Line 171 sub end_essayresponse {
|
$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 |
# |
# |
Line 273 sub file_submission {
|
Line 279 sub file_submission {
|
$files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; |
$files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; |
} |
} |
} |
} |
|
my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
if ($files =~ /[^\s]/) { |
if ($files =~ /[^\s]/) { |
$files =~s/,$//; |
$files =~s/,$//; |
my (@submitted_files,@acceptable_files,@accepted_files); |
my (@submitted_files,@acceptable_files,@accepted_files); |
Line 311 sub file_submission {
|
Line 318 sub file_submission {
|
$$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; |
$$totalsize += $env{'form.HWFILESIZE'.$jspart.'_'.$id}; |
} |
} |
} else { |
} else { |
my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); |
|
my ($path,$filename) = ($file =~ m{^(.*/)([^/]+)$}); |
my ($path,$filename) = ($file =~ m{^(.*/)([^/]+)$}); |
my $fullpath = '/userfiles/portfolio'.$path; |
my $fullpath = '/userfiles/portfolio'.$path; |
if (!exists($dirlist{$fullpath})) { |
if (!exists($dirlist{$fullpath})) { |
Line 347 sub file_submission {
|
Line 353 sub file_submission {
|
push(@accepted_files,$file); |
push(@accepted_files,$file); |
} |
} |
} |
} |
$Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); |
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 (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) { |
|
if ($which eq 'filename') { |
|
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
|
} |
return; |
return; |
} |
} |
if (ref($uploadedflag)) { |
if (ref($uploadedflag)) { |
$$uploadedflag=1; |
$$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') { |
if ($which eq 'filename') { |
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= |
|
$files; |
|
my $cleanpart = $part; |
my $cleanpart = $part; |
$cleanpart =~ s/\W/_/g; |
$cleanpart =~ s/\W/_/g; |
my $cleanid = $id; |
my $cleanid = $id; |
$cleanid =~ s/\W/_/g; |
$cleanid =~ s/\W/_/g; |
my ($map,$resid,$res)=&Apache::lonnet::decode_symb($symb); |
my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb); |
my $container; |
my %crsdesc = &Apache::lonnet::coursedescription($crsid); |
if ($map =~ /^uploaded/) { |
my $turnindir; |
(my $prefix,$container) = ($map =~ m{^uploaded/[^/]+/[^/]+/(default|supplemental)_?([^.]*)\.(?:sequence|page)$}); |
my %userhash = &Apache::lonnet::userenvironment($udom,$uname,'turnindir'); |
if (length($container) > 10) { |
$turnindir = $userhash{'turnindir'}; |
$container = substr($container,-10,10); |
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; |
} |
} |
if ($container ne '') { |
} |
$container = $prefix.'_'.$container; |
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 { |
} else { |
$container = $prefix; |
$$award = 'INTERNAL_ERROR'; |
} |
|
} else { |
|
($container) = ($map =~ m{(.+)\.(?:sequence|page)$}); |
|
$container =~ s/\W/_/g; |
|
if (length($container) > 255) { |
|
$container = substr($container,0,254); |
|
} |
} |
|
} else { |
|
$$award = 'INTERNAL_ERROR'; |
} |
} |
my $subdir = 'essayresponse'; |
push(@pathitems,$restitle); |
my %crsdesc = &Apache::lonnet::coursedescription($crsid); |
unshift(@pathitems,$crsname); |
foreach my $item ($crsdesc{'domain'},$crsdesc{'num'},$container,$resid,$cleanpart,$cleanid) { |
$path .= join('/',@pathitems); |
if ($item ne '') { |
my $formelement = 'HWFILE'.$jspart.'_'.$id; |
$subdir .= '/'.$item; |
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'; |
} |
} |
} |
} |
$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"}=""; |
|
} |
} |
} |
} |
|
|
Line 413 sub delete_form_items {
|
Line 476 sub delete_form_items {
|
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
delete($env{'form.HWFILE'.$jspart.'_'.$id}); |
} |
} |
|
|
|
|
sub check_collaborators { |
sub check_collaborators { |
my ($ncol,$coll) = @_; |
my ($ncol,$coll) = @_; |
my %classlist=&Apache::lonnet::dump('classlist', |
my %classlist=&Apache::lonnet::dump('classlist', |