--- loncom/homework/essayresponse.pm	2005/05/20 18:53:53	1.67
+++ loncom/homework/essayresponse.pm	2006/03/09 01:07:04	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.67 2005/05/20 18:53:53 albertel Exp $
+# $Id: essayresponse.pm,v 1.70 2006/03/09 01:07:04 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"},'<>&"');
@@ -79,7 +80,7 @@ sub end_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $part          = $Apache::inputtags::part;
     my $id            = $Apache::inputtags::response[-1];
-    my $increment     = 1;
+    my $increment     = &Apache::response::repetition();
     my $result;
     if ( $target eq 'grade' ) {
 	my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};	
@@ -141,6 +142,10 @@ sub end_essayresponse {
 	    $result.= '\end{enumerate}';
 	    $increment=$repetition;
 	}
+    } elsif ($target eq 'answer') {
+	$result.=&Apache::response::answer_header($$tagstack[-1]);
+	$result.=&Apache::response::answer_part($$tagstack[-1],'');
+	$result.=&Apache::response::answer_footer($$tagstack[-1]);
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
@@ -164,7 +169,12 @@ sub file_submission {
     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");
 	if ($uploadedfiletypes) {
 	    $uploadedfiletypes=~s/[^\w\,]//g;