--- loncom/homework/essayresponse.pm	2005/04/19 00:56:39	1.64
+++ loncom/homework/essayresponse.pm	2005/11/15 22:19:57	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.64 2005/04/19 00:56:39 matthew Exp $
+# $Id: essayresponse.pm,v 1.69 2005/11/15 22:19:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,8 @@ sub start_essayresponse {
     my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('essayresponse');
-    } elsif ($target eq 'web') {
+    } elsif ($target eq 'web' &&
+	     $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
 	my $part= $Apache::inputtags::part;
 	my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
 	my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
@@ -154,22 +155,31 @@ 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]/) {
 	$files =~s/,$//;
 	$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
-	my @submitted_files = split(/,/,$files);
+	
+	my @submitted_files = ($files);
+	if ( $which eq 'portfiles' ) {
+	    @submitted_files = split(/,/,$files);
+	}
+
 	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
-	$uploadedfiletypes=~s/[^\w\,]//g;
-	$uploadedfiletypes=','.$uploadedfiletypes.',';
-	foreach my $file (@submitted_files) {
-	    my ($extension)=($file=~/\.(\w+)$/);
-	    unless ($uploadedfiletypes=~/\,$extension\,/i) {
-		$$award='INVALID_FILETYPE';
+	if ($uploadedfiletypes) {
+	    $uploadedfiletypes=~s/[^\w\,]//g;
+	    $uploadedfiletypes=','.$uploadedfiletypes.',';
+	    foreach my $file (@submitted_files) {
+		my ($extension)=($file=~/\.(\w+)$/);
+		unless ($uploadedfiletypes=~/\,$extension\,/i) {
+		    $$award='INVALID_FILETYPE';
+		}
 	    }
 	}
 	if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
@@ -177,21 +187,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"}="";
     }
 }