--- loncom/homework/essayresponse.pm	2009/01/21 16:17:35	1.99
+++ loncom/homework/essayresponse.pm	2010/04/20 23:59:53	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.99 2009/01/21 16:17:35 raeburn Exp $
+# $Id: essayresponse.pm,v 1.105 2010/04/20 23:59:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,11 +55,17 @@ sub start_essayresponse {
         if (!defined($maxfilesize)) {
             $maxfilesize = 10.0; #FIXME This should become a domain configuration 
         }
-	if ( $Apache::lonhomework::type eq 'survey' ) {
+	if (($Apache::lonhomework::type eq 'survey') ||
+            ($Apache::lonhomework::type eq 'surveycred') ||
+            ($Apache::lonhomework::type eq 'anonsurvey') ||
+            ($Apache::lonhomework::type eq 'anonsurveycred')) {
 	    $result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> ';
 	}
 	$result.='<br /><table border="1">';
-	if ( $Apache::lonhomework::type ne 'survey' ) {
+	if (($Apache::lonhomework::type ne 'survey') &&
+            ($Apache::lonhomework::type ne 'surveycred') &&
+            ($Apache::lonhomework::type ne 'anonsurvey') &&
+            ($Apache::lonhomework::type ne 'anonsurveycred')) {
 	    $result.= '<tr><td>'.
 		'<label>'.
 		'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
@@ -67,7 +73,7 @@ sub start_essayresponse {
 		'</label> <br />'.
 		'<label>'.
 		'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
-		&mt('Save entries below as a draft answer (not submitting them for credit yet)').
+		&mt('Save entries below (not submitted for credit yet)').
 		'</label>'.
 		'</td></tr>';
 	}
@@ -146,7 +152,15 @@ sub end_essayresponse {
 	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
  		my $award='DRAFT';
         	if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
-		    $award='SUBMITTED';
+                    if ($Apache::lonhomework::type eq 'anonsurvey') {
+                        $award='ANONYMOUS';
+                    } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+                        $award='ANONYMOUS_CREDIT';
+                    } elsif ($Apache::lonhomework::type eq 'surveycred') {
+                        $award='SUBMITTED_CREDIT';
+                    } else {
+		        $award='SUBMITTED';
+                    }
 		}
                 my $uploadedflag=0;
                 my $totalsize=0;
@@ -282,9 +296,7 @@ sub file_submission {
                 }
             }
         } else {
-            foreach my $file (@submitted_files) {
-                push(@acceptable_files,$file);
-            }
+            @acceptable_files = @submitted_files;
         }
         my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize");
         if (!$maxfilesize) {
@@ -334,7 +346,7 @@ sub file_submission {
             }
         }
         $Apache::lonhomework::results{"resource.$part.$id.$which"}=join(',',@accepted_files);
-        if (($$award eq 'INVALID_FILETYPE') || ($award eq 'EXCESS_FILESIZE')) {
+        if (($$award eq 'INVALID_FILETYPE') || ($$award eq 'EXCESS_FILESIZE')) {
             return;
         }
 	if (ref($uploadedflag)) {