--- loncom/homework/essayresponse.pm	2004/10/30 23:59:00	1.45
+++ loncom/homework/essayresponse.pm	2004/12/06 18:09:54	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.45 2004/10/30 23:59:00 banghart Exp $
+# $Id: essayresponse.pm,v 1.52 2004/12/06 18:09:54 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,9 +51,9 @@ sub start_essayresponse {
 	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
 	$result='<br /><table border="1">';
 	$result.='<tr><td>'.
-	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
 	    &mt('Submit entries below as answer to receive credit').' <br />'.
-	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no"> '.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" /> '.
 	    &mt('Save entries below as a draft answer (not submitting them for credit yet)').
 	    ' </td></tr>';
 	if ($ncol > 0) {
@@ -70,13 +70,13 @@ sub start_essayresponse {
 		$part.'_'.$id.'" onFocus="this.form.enctype='.
 		"'multipart/form-data'".';" /><br />'.
 		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
-                '<strong>OR:</strong><br /><a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'.
-                'width=500,scrollbars=1,resizable=1,menubar=0,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=600,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>Select Portfolio Files</a>'.
                 '<br />'.
                 '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
 		'<br />';
 	    if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	        $result.="Portfolio files previously selected: <strong>".$Apache::lonhomework::history{"resource.$part.$id.portfiles"}."</strong><br />";
+	        $result.="Portfolio files previously selected: <strong>".&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"})."</strong><br />";
 	    }
 
             if ($uploadedfile) {
@@ -140,15 +140,13 @@ sub end_essayresponse {
                    }
 	        }
                 if ($portfiles =~ /[^\s]/) {
+                    $portfiles =~s/,$//;
                     $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
-                    $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=$portfiles;
                     my @submitted_files = split /,/,$portfiles;
-		    my ($dsymb,$crsid,$domain,$name)=
-			&Apache::lonxml::whichuser();
-                    foreach (@submitted_files) {
-                        my $file = $_;
-                        $Apache::lonhomework::results{"resource.$domain.$crsid.$name.$file"}='true';
-                    }
+		    my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+		    &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
+                    &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$dsymb.$crsid);
+                    &Apache::lonnet::clear_selected_files($name);
                     $uploadedflag=1;
     	        }
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;