--- loncom/homework/essayresponse.pm	2005/05/20 18:53:53	1.67
+++ loncom/homework/essayresponse.pm	2006/09/21 21:23:19	1.74
@@ -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.74 2006/09/21 21:23:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,9 @@ use strict;
 use Apache::lonxml();
 use Apache::lonnet;
 use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -42,7 +45,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"},'<>&"');
@@ -71,6 +75,32 @@ sub start_essayresponse {
 	$result.=&Apache::inputtags::file_selector($part,$id,
 						   $uploadedfiletypes,'both');
         $result.='</table>';
+    } elsif ($target eq 'web' &&
+	     $Apache::inputtags::status[-1] ne 'CAN_ANSWER') {
+	my $part= $Apache::inputtags::part;
+	my @msgs;
+	if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) {
+	    my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
+	    $result .= '<td>'.&mt('Collaborated with [_1]',$coll).'</td>';
+	}
+
+	my $file_submission = 
+	    &Apache::inputtags::show_past_file_submission($part,$id);
+	if ($file_submission) {
+	    $result .= '<td>'.$file_submission.'</td>';
+	}
+
+	my $port_submission = 
+	    &Apache::inputtags::show_past_portfile_submission($part,$id);
+	if ($port_submission) {
+	    $result .= '<td>'.$port_submission.'</td>';
+	}
+
+	if ($result ne '') {
+	    $result = 
+		'<table class="LC_pastsubmission"><tr>'.$result.
+		'</tr></table>';
+	}
     }
     return $result;
 }
@@ -79,7 +109,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};	
@@ -118,7 +148,7 @@ sub end_essayresponse {
 			    &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
 			my ($adom,$aname,$apath)=
 			    ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
-                        $apath=&Apache::lonnet::escape($apath);
+                        $apath=&escape($apath);
 			$apath=~s/\W/\_/gs;
 			&Apache::lonnet::put('nohist_essay_'.$apath,
 					 { $akey => $response },$adom,$aname);
@@ -128,20 +158,17 @@ sub end_essayresponse {
 	} 
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table();
-    } elsif ($target eq 'tex') {
-	if ($Apache::lonhomework::type eq 'exam') {
-	    my $repetition=&Apache::response::repetition();
-	    $result.='\begin{enumerate}';
-	    if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
-	    for (my $i=0;$i<$repetition;$i++) {
-		$result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
-		    '}.]\textit{'.&mt('Leave blank on scoring form').
-		    '}\vskip 0 mm';
-	    }
-	    $result.= '\end{enumerate}';
-	    $increment=$repetition;
-	}
+
+    } elsif ($target eq 'tex'
+	     && $Apache::lonhomework::type eq 'exam') {
+	$result .= &Apache::inputtags::exam_score_line($target);
+
+    } 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') {
 	&Apache::lonxml::increment_counter($increment);
@@ -164,7 +191,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(/\s*,\s*/,$files);
+	}
+
 	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
 	if ($uploadedfiletypes) {
 	    $uploadedfiletypes=~s/[^\w\,]//g;