--- loncom/homework/essayresponse.pm 2005/05/03 05:31:51 1.65 +++ loncom/homework/essayresponse.pm 2005/05/20 18:53:53 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # essay (ungraded) style responses # -# $Id: essayresponse.pm,v 1.65 2005/05/03 05:31:51 albertel Exp $ +# $Id: essayresponse.pm,v 1.67 2005/05/20 18:53:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -154,9 +154,11 @@ sub end_essayresponse { sub file_submission { my ($part,$id,$which,$award,$uploadedflag)=@_; my $files; - if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$part.'_'.$id}; } + my $jspart=$part; + $jspart=~s/\./_/g; + if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; } if ($which eq 'filename') { - $files = $env{'form.HWFILE'.$part.'_'.$id.'.filename'}; + $files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'}; } if ($files =~ /[^\s]/) { @@ -179,21 +181,21 @@ sub file_submission { } 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::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') { $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}= $files; $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}= - &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef, + &Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$id,undef, 'essayresponse'); } } 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); + &Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]); $Apache::lonhomework::results{"resource.$part.$id.$which"}=""; } }