--- loncom/homework/essayresponse.pm 2005/04/07 06:56:21 1.62 +++ loncom/homework/essayresponse.pm 2005/04/08 19:21:52 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.62 2005/04/07 06:56:21 albertel Exp $ +# $Id: essayresponse.pm,v 1.63 2005/04/08 19:21:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -95,8 +95,8 @@ sub end_essayresponse { $award='SUBMITTED'; } my $uploadedflag=0; - &file_submission($part,$id,'filename',$award,\$uploadedflag); - &file_submission($part,$id,'portfiles',$award,\$uploadedflag); + &file_submission($part,$id,'filename',\$award,\$uploadedflag); + &file_submission($part,$id,'portfiles',\$award,\$uploadedflag); $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); @@ -164,19 +164,19 @@ sub file_submission { foreach my $file (@submitted_files) { my ($extension)=($file=~/\.(\w+)$/); unless ($uploadedfiletypes=~/\,$extension\,/i) { - $award='INVALID_FILETYPE'; + $$award='INVALID_FILETYPE'; } } - if ($award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { + if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) { $$uploadedflag=1; } - if ($award ne 'INVALID_FILETYPE' && $which eq 'portfiles') { + 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); &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid); &Apache::lonnet::clear_selected_files($name); } - if ($award ne 'INVALID_FILETYPE' && $which eq 'filename') { + if ($$award ne 'INVALID_FILETYPE' && $which eq 'filename') { $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= $files; $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=