version 1.56, 2004/12/16 21:21:35
|
version 1.59, 2005/02/10 22:43:15
|
Line 108 sub end_essayresponse {
|
Line 108 sub end_essayresponse {
|
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators |
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators |
if ($collaborators ne $previous_list); |
if ($collaborators ne $previous_list); |
} |
} |
if ( defined($ENV{'form.submitted'}) && |
if ( &Apache::response::submitted('scantron') ) { |
$ENV{'form.submitted'} eq 'scantron' ) { |
|
$increment=&Apache::response::scored_response($part,$id); |
$increment=&Apache::response::scored_response($part,$id); |
} elsif ( defined($ENV{'form.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 $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'}; |
my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id}; |
my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id}; |
Line 144 sub end_essayresponse {
|
Line 143 sub end_essayresponse {
|
$portfiles =~s/,$//; |
$portfiles =~s/,$//; |
$Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles; |
$Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles; |
my @submitted_files = split /,/,$portfiles; |
my @submitted_files = split /,/,$portfiles; |
my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes"); |
&Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid); |
$uploadedfiletypes=~s/[^\w\,]//g; |
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid); |
$uploadedfiletypes=','.$uploadedfiletypes.','; |
&Apache::lonnet::clear_selected_files($name); |
foreach (@submitted_files) { |
$uploadedflag=1; |
my ($extension)=($_=~/\.(\w+)$/); |
|
unless ($uploadedfiletypes=~/\,$extension\,/i) { |
|
$award='INVALID_FILETYPE'; |
|
} |
|
} |
|
if ($award ne 'INVALID_FILETYPE'){ |
|
my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
|
&Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid); |
|
&Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid); |
|
&Apache::lonnet::clear_selected_files($name); |
|
$uploadedflag=1; |
|
} |
} else { |
} else { |
|
my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser(); |
|
&Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid); |
$Apache::lonhomework::results{"resource.$part.$id.portfiles"}=""; |
$Apache::lonhomework::results{"resource.$part.$id.portfiles"}=""; |
} |
} |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response; |