--- loncom/homework/essayresponse.pm	2005/04/05 15:38:57	1.61
+++ loncom/homework/essayresponse.pm	2006/05/30 12:45:36	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.61 2005/04/05 15:38:57 albertel Exp $
+# $Id: essayresponse.pm,v 1.72 2006/05/30 12:45:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,11 @@
 package Apache::essayresponse;
 use strict;
 use Apache::lonxml();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -42,7 +45,8 @@ sub start_essayresponse {
     my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('essayresponse');
-    } elsif ($target eq 'web') {
+    } elsif ($target eq 'web' &&
+	     $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
 	my $part= $Apache::inputtags::part;
 	my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
 	my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
@@ -50,16 +54,21 @@ sub start_essayresponse {
         $uploadedfiletypes=~s/[^\w\,]//g;
 	$result='<br /><table border="1">';
 	$result.='<tr><td>'.
+            '<label>'.
 	    '<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" /> '.
+	    &mt('Submit entries below as answer to receive credit').
+            '</label> <br />'.
+	    '<label>'.
+            '<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>';
+	    '</label>'.
+            ' </td></tr>';
 	if ($ncol > 0) {
-	    $result .='<tr><td>'.
+	    $result .='<tr><td>'.'<label>'.
 		'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'}).
+                '</label><br />';
 	    $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
 	    $result .='</td></tr>';
 	}
@@ -74,10 +83,10 @@ 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 $increment     = &Apache::response::repetition();
     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,17 +95,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='DRAFT';
-        	if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
+        	if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
 		    $award='SUBMITTED';
 		}
                 my $uploadedflag=0;
-		&file_submission($part,$id,'filename',$award,\$uploadedflag);
-		&file_submission($part,$id,'portfiles',$award,\$uploadedflag);
+		&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);
@@ -113,7 +122,7 @@ sub end_essayresponse {
 			    &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
 			my ($adom,$aname,$apath)=
 			    ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
-                        $apath=&Apache::lonnet::escape($apath);
+                        $apath=&escape($apath);
 			$apath=~s/\W/\_/gs;
 			&Apache::lonnet::put('nohist_essay_'.$apath,
 					 { $akey => $response },$adom,$aname);
@@ -123,20 +132,17 @@ sub end_essayresponse {
 	} 
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table();
-    } elsif ($target eq 'tex') {
-	if ($Apache::lonhomework::type eq 'exam') {
-	    my $repetition=&Apache::response::repetition();
-	    $result.='\begin{enumerate}';
-	    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').
-		    '}\vskip 0 mm';
-	    }
-	    $result.= '\end{enumerate}';
-	    $increment=$repetition;
-	}
+
+    } elsif ($target eq 'tex'
+	     && $Apache::lonhomework::type eq 'exam') {
+	$result .= &Apache::inputtags::exam_score_line($target);
+
+    } elsif ($target eq 'answer') {
+	$result.=&Apache::response::answer_header($$tagstack[-1]);
+	$result.=&Apache::response::answer_part($$tagstack[-1],'');
+	$result.=&Apache::response::answer_footer($$tagstack[-1]);
     }
+
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	&Apache::lonxml::increment_counter($increment);
@@ -149,44 +155,53 @@ sub end_essayresponse {
 sub file_submission {
     my ($part,$id,$which,$award,$uploadedflag)=@_;
     my $files;
-    if ($which eq 'portfiles') { $files= $ENV{'form.HWPORT'.$part.'_'.$id}; }
+    my $jspart=$part;
+    $jspart=~s/\./_/g;
+    if ($which eq 'portfiles') { $files= $env{'form.HWPORT'.$jspart.'_'.$id}; }
     if ($which eq 'filename') {
-	$files = $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
+	$files = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'};
     }
     
     if ($files =~ /[^\s]/) {
 	$files =~s/,$//;
 	$Apache::lonhomework::results{"resource.$part.$id.$which"}=$files;
-	my @submitted_files = split(/,/,$files);
+	
+	my @submitted_files = ($files);
+	if ( $which eq 'portfiles' ) {
+	    @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 ($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)) {
+	if ($$award ne 'INVALID_FILETYPE' && ref($uploadedflag)) {
 	    $$uploadedflag=1;
 	}
-	if ($award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
+	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::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') {
+	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,
+		&Apache::lonnet::userfileupload('HWFILE'.$jspart.'_'.$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::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
 	$Apache::lonhomework::results{"resource.$part.$id.$which"}="";
     }
 }
@@ -194,8 +209,8 @@ sub file_submission {
 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) {
@@ -203,7 +218,7 @@ sub check_collaborators {
 	if (/@/) {
 	    $collaborator =~ s/@/:/;
 	} else {
-	    $collaborator = $_.':'.$ENV{'user.domain'};
+	    $collaborator = $_.':'.$env{'user.domain'};
 	}
 	push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
     }