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

[banghart]

banghart		Tue Oct 19 15:14:51 2004 EDT

  Modified files:              
    /loncom/homework	essayresponse.pm 
  Log:
  	Change query field name from "action" to "mode" for fileselect
  
  
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.40 loncom/homework/essayresponse.pm:1.41
--- loncom/homework/essayresponse.pm:1.40	Mon Oct 18 18:14:15 2004
+++ loncom/homework/essayresponse.pm	Tue Oct 19 15:14:51 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.40 2004/10/18 22:14:15 banghart Exp $
+# $Id: essayresponse.pm,v 1.41 2004/10/19 19:14:51 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@
 	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
 	$result='<br /><table border="1">';
 	$result.='<tr><td>'.
-        '<a href='."'".'javascript:void(window.open("/adm/portfolio?action=selectfile&fieldname=HWPORT'.$part.'_'.$id.'","cat","height=400,'.
+        '<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>'.
         '<br />'.
             '<input type="text" name="HWPORT'.$part.'_'.$id.'" value="Selected files will appear here." /><br />'.
@@ -113,7 +113,7 @@
 	    my $response      = $ENV{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
             my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id.'.filename'};
-	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
+	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles != "Selected files will appear here.")) {
  		my $award;
 		if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
 		    $award='SUBMITTED';
@@ -135,7 +135,11 @@
 		      $award='INVALID_FILETYPE';
                    }
 	        }
+                if ($portfiles != "Selected files will appear here.") {
+                    $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
+                }
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
+		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$portfiles;
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
 		my %previous=&Apache::response::check_for_previous($response,$part,$id);
 		unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }