[LON-CAPA-cvs] cvs: loncom /homework essayresponse.pm

[banghart]

banghart		Tue Dec 14 13:44:57 2004 EDT

  Modified files:              
    /loncom/homework	essayresponse.pm 
  Log:
  	Now explicitly sets response hash values to "" in absence of 
  	file submission (both portfolio and uploaded). Fixes "sticky"
  	file submissions on subsequent answers to essay.
  	Fixes bug 3699
  
  
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.52 loncom/homework/essayresponse.pm:1.53
--- loncom/homework/essayresponse.pm:1.52	Mon Dec  6 13:09:54 2004
+++ loncom/homework/essayresponse.pm	Tue Dec 14 13:44:56 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.52 2004/12/06 18:09:54 banghart Exp $
+# $Id: essayresponse.pm,v 1.53 2004/12/14 18:44:56 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,11 +67,11 @@
         if ($uploadedfiletypes) {
 	    $result.='<tr><td>'.&mt('Submit a file:').
 		' <br /><input type="file" size="50" name="HWFILE'.
-		$part.'_'.$id.'" onFocus="this.form.enctype='.
-		"'multipart/form-data'".';" /><br />'.
+#		$part.'_'.$id.'" onFocus="this.form.enctype='.
+#		"'multipart/form-data'".';" /><br />'.
+		$part.'_'.$id.'" '.
 		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
-                '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,'.
-                'width=600,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.
+                '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.
                 '<br />'.
                 '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
 		'<br />';
@@ -117,6 +117,7 @@
 	    my $response      = $ENV{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
             my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
+            &Apache::lonnet::logthis("portfiles now $portfiles");
 	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
  		my $award;
         	if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
@@ -126,6 +127,7 @@
 		}
                 my $uploadedflag=0;
                 if ($filename =~ /[^\s]/) {
+                   &Apache::lonnet::logthis("the file to upload is $filename");
  	           my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
                    $uploadedfiletypes=~s/[^\w\,]//g;
                    $uploadedfiletypes=','.$uploadedfiletypes.',';
@@ -138,6 +140,9 @@
 		   } else {
 		      $award='INVALID_FILETYPE';
                    }
+	        } else {
+	           $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}="";
+                   $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}="";
 	        }
                 if ($portfiles =~ /[^\s]/) {
                     $portfiles =~s/,$//;
@@ -148,6 +153,8 @@
                     &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
                     &Apache::lonnet::clear_selected_files($name);
                     $uploadedflag=1;
+    	        } else {
+    	            $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";
     	        }
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;