--- loncom/homework/essayresponse.pm	2009/09/23 02:58:00	1.101.8.1
+++ loncom/homework/essayresponse.pm	2010/04/19 04:20:25	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.101.8.1 2009/09/23 02:58:00 gci Exp $
+# $Id: essayresponse.pm,v 1.104 2010/04/19 04:20:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,8 @@ BEGIN {
 sub start_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+    print STDERR "target is $target AND status is ".$Apache::inputtags::status[-1]." AND ".
+                 " type is ".$Apache::lonhomework::type."\n";
     my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('essayresponse');
@@ -55,15 +57,18 @@ 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 ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
-                $result .= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />';
-            } else {
-              $result.= '<tr><td>'.
+	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" /> '.
 		&mt('Submit entries below as answer to receive credit').
@@ -73,7 +78,6 @@ sub start_essayresponse {
 		&mt('Save entries below (not submitted for credit yet)').
 		'</label>'.
 		'</td></tr>';
-            }
 	}
 
 	if ($ncol > 0) {
@@ -150,7 +154,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;
@@ -336,7 +348,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)) {