--- loncom/homework/essayresponse.pm	2005/03/31 21:24:29	1.60
+++ loncom/homework/essayresponse.pm	2005/04/07 06:56:21	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.60 2005/03/31 21:24:29 albertel Exp $
+# $Id: essayresponse.pm,v 1.62 2005/04/07 06:56:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,7 +29,7 @@
 package Apache::essayresponse;
 use strict;
 use Apache::lonxml();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonlocal;
 
 BEGIN {
@@ -59,7 +59,7 @@ sub start_essayresponse {
 	    $result .='<tr><td>'.
 		'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
 		$part.'_'.$id.'" value="'.$coll.'" /><br />'.
-		&mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$ENV{'user.domain'}).'<br />';
+		&mt('(Enter maximum [_1] collaborators using username or username@domain, e.g. smithje or smithje@[_2].)',$ncol,$env{'user.domain'}).'<br />';
 	    $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
 	    $result .='</td></tr>';
 	}
@@ -77,7 +77,7 @@ sub end_essayresponse {
     my $increment     = 1;
     my $result;
     if ( $target eq 'grade' ) {
-	my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	
+	my $collaborators = $env{'form.HWCOL'.$part.'_'.$id};	
 	if ($collaborators =~ /[^\s]/) {
 	    my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
 	    $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
@@ -86,59 +86,17 @@ sub end_essayresponse {
 	if (  &Apache::response::submitted('scantron') ) {
 	    $increment=&Apache::response::scored_response($part,$id);
 	} elsif ( &Apache::response::submitted() ) {
-	    my $response      = $ENV{'form.HWVAL_'.$id};
-            my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
-            my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
+	    my $response      = $env{'form.HWVAL_'.$id};
+            my $filename= $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
+            my $portfiles = $env{'form.HWPORT'.$part.'_'.$id};
 	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
- 		my $award;
-        	if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+ 		my $award='DRAFT';
+        	if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
 		    $award='SUBMITTED';
-		} else {
-		    $award='DRAFT';
 		}
                 my $uploadedflag=0;
-                if ($filename =~ /[^\s]/) {
- 	            my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
-                    $uploadedfiletypes=~s/[^\w\,]//g;
-                    $uploadedfiletypes=','.$uploadedfiletypes.',';
-                    my ($extension)=($filename=~/\.(\w+)$/);
-	            if ($uploadedfiletypes=~/\,$extension\,/i) {
-	                $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
-                        $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
-                        &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,'essayresponse');
-                        $uploadedflag=1;
-		    } else {
-		        $award='INVALID_FILETYPE';
-                    }
-	        } else {
-	           $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}="";
-                   $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}="";
-	        }
-                if ($portfiles =~ /[^\s]/) {
-                    $portfiles =~s/,$//;
-                    $Apache::lonhomework::results{"resource.$part.$id.portfiles"}=$portfiles;
-                    my @submitted_files = split /,/,$portfiles;
- 	            my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
-                    $uploadedfiletypes=~s/[^\w\,]//g;
-                    $uploadedfiletypes=','.$uploadedfiletypes.',';
-                    foreach (@submitted_files) {
-                        my ($extension)=($_=~/\.(\w+)$/);
-	                unless ($uploadedfiletypes=~/\,$extension\,/i) {
-	                    $award='INVALID_FILETYPE';
-                        }
-                    }
-                    if ($award ne 'INVALID_FILETYPE'){
-        		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;
-                    }
-    	        } else {
-		    my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
-    	            &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
-    	            $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";
-    	        }
+		&file_submission($part,$id,'filename',$award,\$uploadedflag);
+		&file_submission($part,$id,'portfiles',$award,\$uploadedflag);
 		$Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
 		my %previous=&Apache::response::check_for_previous($response,$part,$id);
@@ -169,7 +127,7 @@ sub end_essayresponse {
 	if ($Apache::lonhomework::type eq 'exam') {
 	    my $repetition=&Apache::response::repetition();
 	    $result.='\begin{enumerate}';
-	    if ($ENV{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
+	    if ($env{'request.state'} eq "construct" ) {$result.='\item[\strut]';}
 	    for (my $i=0;$i<$repetition;$i++) {
 		$result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
 		    '}.]\textit{'.&mt('Leave blank on scoring form').
@@ -188,11 +146,56 @@ sub end_essayresponse {
     return $result;
 }
 
+sub file_submission {
+    my ($part,$id,$which,$award,$uploadedflag)=@_;
+    my $files;
+    if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$part.'_'.$id}; }
+    if ($which eq 'filename') {
+	$files = $env{'form.HWFILE'.$part.'_'.$id.'.filename'};
+    }
+    
+    if ($files =~ /[^\s]/) {
+	$files =~s/,$//;
+	$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
+	my @submitted_files = split(/,/,$files);
+	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+	$uploadedfiletypes=~s/[^\w\,]//g;
+	$uploadedfiletypes=','.$uploadedfiletypes.',';
+	foreach my $file (@submitted_files) {
+	    my ($extension)=($file=~/\.(\w+)$/);
+	    unless ($uploadedfiletypes=~/\,$extension\,/i) {
+		$award='INVALID_FILETYPE';
+	    }
+	}
+	if ($award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
+	    $$uploadedflag=1;
+	}
+	if ($award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
+	    my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	    &Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
+	    &Apache::lonnet::mark_as_readonly($domain,$name,\@submitted_files,$symb.$crsid);
+	    &Apache::lonnet::clear_selected_files($name);
+	}
+	if ($award ne 'INVALID_FILETYPE' && $which eq 'filename') {
+	    $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=
+		$files;
+	    $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
+		&Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id,undef,
+						'essayresponse');
+	}
+    } elsif ($which eq 'portfiles' &&
+	     $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
+	my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	&Apache::lonnet::unmark_as_readonly($domain,$name,$symb.$crsid);
+	$Apache::lonhomework::results{"resource.$part.$id.$which"}="";
+    }
+}
+
 sub check_collaborators {
     my ($ncol,$coll) = @_;
     my %classlist=&Apache::lonnet::dump('classlist',
-					$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-					$ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+					$env{'course.'.$env{'request.course.id'}.'.domain'},
+					$env{'course.'.$env{'request.course.id'}.'.num'});
     my (@badcollaborators,$result);
     my (@collaborators) = split(/\,?\s+/,$coll);
     foreach (@collaborators) {
@@ -200,7 +203,7 @@ sub check_collaborators {
 	if (/@/) {
 	    $collaborator =~ s/@/:/;
 	} else {
-	    $collaborator = $_.':'.$ENV{'user.domain'};
+	    $collaborator = $_.':'.$env{'user.domain'};
 	}
 	push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
     }