version 1.93, 2008/12/09 00:23:22
|
version 1.97, 2009/01/01 16:45:32
|
Line 203 sub end_essayresponse {
|
Line 203 sub end_essayresponse {
|
|
|
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
$Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse'; |
$Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse'; |
|
push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); |
&Apache::lonhomework::set_bubble_lines(); |
&Apache::lonhomework::set_bubble_lines(); |
} |
} |
} |
} |
Line 293 sub file_submission {
|
Line 294 sub file_submission {
|
} |
} |
} else { |
} else { |
my ($symb,$crsid,$udom,$uname) = &Apache::lonnet::whichuser(); |
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})) { |
my @list = &Apache::lonnet::dirlist($fullpath,$udom,$uname,1); |
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, |
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); |
split(/\&/,$dir_line,16); |
Line 309 sub file_submission {
|
Line 313 sub file_submission {
|
last; |
last; |
} |
} |
} |
} |
$dirlist{$fullpath} = \@list; |
|
} |
} |
} |
} |
if (ref($totalsize)) { |
if (ref($totalsize)) { |
Line 318 sub file_submission {
|
Line 321 sub file_submission {
|
if ($which eq 'filename') { |
if ($which eq 'filename') { |
&delete_form_items($jspart,$id); |
&delete_form_items($jspart,$id); |
} |
} |
|
last; |
|
} else { |
|
push(@accepted_files,$file); |
} |
} |
} else { |
} else { |
push(@accepted_files,$file); |
push(@accepted_files,$file); |
} |
} |
} |
} |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
|
$Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files); |
$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; |
return; |
Line 331 sub file_submission {
|
Line 336 sub file_submission {
|
if (ref($uploadedflag)) { |
if (ref($uploadedflag)) { |
$$uploadedflag=1; |
$$uploadedflag=1; |
} |
} |
|
my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); |
if ($which eq 'portfiles') { |
if ($which eq 'portfiles') { |
my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser(); |
|
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]); |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,[$symb,$crsid]); |
&Apache::lonnet::clear_selected_files($name); |
&Apache::lonnet::clear_selected_files($name); |
Line 340 sub file_submission {
|
Line 345 sub file_submission {
|
if ($which eq 'filename') { |
if ($which eq 'filename') { |
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= |
$Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= |
$files; |
$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::lonhomework::results{"resource.$part.$id.uploadedurl"}= |
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, |
&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, |
'essayresponse'); |
$subdir); |
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); |
&Apache::lonnet::delenv($env{'form.HWFILE'.$jspart.'_'.$id}); |
} |
} |
} elsif ($which eq 'portfiles' && |
} elsif ($which eq 'portfiles' && |