--- loncom/homework/essayresponse.pm	2003/01/24 18:30:54	1.20
+++ loncom/homework/essayresponse.pm	2003/04/18 07:12:13	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.20 2003/01/24 18:30:54 www Exp $
+# $Id: essayresponse.pm,v 1.27 2003/04/18 07:12:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,8 +49,15 @@ sub start_essayresponse {
 	my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
 	my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
 	my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+        $uploadedfiletypes=~s/[^\w\,]//g;
 	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>'.
+	    ' Submit entries below as answer to receive credit <br />'.
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.
+	    ' Save entries below as a draft answer (not submitting them for credit yet) '.
+	    '</td></tr>';
 	if ($ncol > 0) {
 	    $result .='<tr><td>'.
 		'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
@@ -67,18 +74,13 @@ sub start_essayresponse {
 "'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';
            if ($uploadedfile) {
 	       $result.='Currently submitted: <tt><a href="'.
-                &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'">'.$uploadedfile.'</a></tt>';
+                &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> '.$uploadedfile.'</a></tt>';
            } else {
               $result.='(Hand in a file you have prepared on your computer)';
            }
            $result.='</td></tr>'; 
         }
-	$result.='<tr><td>'.
-	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked>'.
-	    ' Submit text below as answer to receive credit <br />'.
-	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no">'.
-	    ' Save text below as a draft answer (not submitting it for credit yet) '.
-	    '</td></tr></table>';
+        $result.='</table>';
     }
     return $result;
 }
@@ -87,6 +89,7 @@ sub end_essayresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $part          = $Apache::inputtags::part;
     my $id            = $Apache::inputtags::response[-1];
+    my $increment     = 1;
     my $result;
     if ( $target eq 'grade' ) {
 	my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	
@@ -95,38 +98,58 @@ sub end_essayresponse {
 	    $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
 		if ($collaborators ne $previous_list);
 	}
-        my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
-        if ($filename =~ /[^\s]/) {
-	    $Apache::lonhomework::results{"resource.$part.$id.uploadedfile"}=$filename;
-            $Apache::lonhomework::results{"resource.$part.$id.uploadedurl"}=
-              &Apache::lonnet::userfileupload('HWFILE'.$part.'_'.$id);
-        }
-	if ( defined $ENV{'form.submitted'}) {
-	    my $response      = $ENV{'form.HWVAL'.$id};
-	    if ( $response =~ /[^\s]/) {
-		my $award;
+	if ( defined($ENV{'form.submitted'}) &&
+	     $ENV{'form.submitted'}='scantron' ) {
+	    my $repetition=&Apache::response::repetition();
+	    $increment=$repetition;
+	} elsif ( defined($ENV{'form.submitted'}) ) {
+	    my $response      = $ENV{'form.HWVAL_'.$id};
+            my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
+	    if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/)) {
+ 		my $award;
 		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);
+                      $uploadedflag=1;
+		   } else {
+		      $award='INVALID_FILETYPE';
+                   }
+	        }
 		$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);
-		&Apache::response::handle_previous(\%previous,$award);
+		unless ($uploadedflag) { &Apache::response::handle_previous(\%previous,$award); }
 	    }
 	}
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {
 	if ($Apache::lonhomework::type eq 'exam') {
-	    $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm';
-	    &Apache::lonxml::increment_counter();
-	    $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm \end{enumerate}';
-	    &Apache::lonxml::increment_counter();
+	    my $repetition=&Apache::response::repetition();
+	    $result.='\begin{enumerate}';
+	    for (my $i=0;$i<$repetition;$i++) {
+		$result.='\item[\textbf{'.($Apache::lonxml::counter+$i).
+		    '}.]\textit{Leave blank on scoring form}\vskip 0 mm';
+	    }
+	    $result.= '\end{enumerate}';
 	}
     }
-
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze') {
+	&Apache::lonxml::increment_counter($increment);
+    }
     &Apache::response::end_response;
     return $result;
 }