--- loncom/homework/essayresponse.pm	2003/04/18 07:12:13	1.27
+++ loncom/homework/essayresponse.pm	2004/03/31 05:23:59	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.27 2003/04/18 07:12:13 albertel Exp $
+# $Id: essayresponse.pm,v 1.34 2004/03/31 05:23:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,13 +25,12 @@
 #
 # http://www.lon-capa.org/
 #
-# 4/3 Guy
-# July, 2002, H. K. Ng
-#
+
 package Apache::essayresponse;
 use strict;
-use Apache::lonxml;
-use Apache::lonnet;
+use Apache::lonxml();
+use Apache::lonnet();
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::essayresponse',('essayresponse'));
@@ -47,36 +46,39 @@ sub start_essayresponse {
 	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"});
+	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"});
+	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>';
+	    '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
+	    &mt('Submit entries below as answer to receive credit').' <br />'.
+	    '<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) {
 	    $result .='<tr><td>'.
 		'Collaborators: <input type="text" size="70" max="80" name="HWCOL'.
 		$part.'_'.$id.'" value="'.$coll.'" /><br />'.
-		'(Enter maximum '.$ncol.' collaborators using username or username@domain, e.g. '.
-		'smithje or smithje@'.$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>';
 	}
         if ($uploadedfiletypes) {
-           $result.=
-'<tr><td>Submit a file: <input type="file" size="50" name="HWFILE'.
+	    $result.='<tr><td>'.&mt('Submit a file:').
+		' <input type="file" size="50" name="HWFILE'.
 		$part.'_'.$id.'" onFocus="this.form.enctype='.
-"'multipart/form-data'".';" /><br />Allowed filetypes: <b>'.$uploadedfiletypes.'</b><br />';
+		"'multipart/form-data'".';" /><br />'.
+		&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).
+		'<br />';
            if ($uploadedfile) {
-	       $result.='Currently submitted: <tt><a href="'.
-                &Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).'"><img src="/adm/lonIcons/unknown.gif" border=0"> '.$uploadedfile.'</a></tt>';
+	       my $curfile='<a href="'.&Apache::lonnet::tokenwrapper($Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}).
+		   '"><img src="/adm/lonIcons/unknown.gif" border=0" /> '.
+		   $uploadedfile.'</a>';
+	       $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
            } else {
-              $result.='(Hand in a file you have prepared on your computer)';
+              $result.=&mt('(Hand in a file you have prepared on your computer)');
            }
            $result.='</td></tr>'; 
         }
@@ -94,14 +96,13 @@ sub end_essayresponse {
     if ( $target eq 'grade' ) {
 	my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};	
 	if ($collaborators =~ /[^\s]/) {
-	    my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+	    my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
 	    $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
 		if ($collaborators ne $previous_list);
 	}
 	if ( defined($ENV{'form.submitted'}) &&
-	     $ENV{'form.submitted'}='scantron' ) {
-	    my $repetition=&Apache::response::repetition();
-	    $increment=$repetition;
+	     $ENV{'form.submitted'} eq 'scantron' ) {
+	    $increment=&Apache::response::scored_response($part,$id);
 	} elsif ( defined($ENV{'form.submitted'}) ) {
 	    my $response      = $ENV{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
@@ -131,6 +132,24 @@ sub end_essayresponse {
 		$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); }
+#
+# Store with resource author for similarity testing
+#
+                if ($award eq 'SUBMITTED') {
+		    my ($symb,$crsid,$domain,$name)=
+			&Apache::lonxml::whichuser();
+		    if ($crsid) {
+			my $akey=$name.'.'.$domain.'.'.$crsid;
+			my $essayurl=
+			    &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
+			my ($adom,$aname,$apath)=
+			    ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+                        $apath=&Apache::lonnet::escape($apath);
+			$apath=~s/\W/\_/gs;
+			&Apache::lonnet::put('nohist_essay_'.$apath,
+					 { $akey => $response },$adom,$aname);
+		    }
+               }
 	    }
 	}
     } elsif ($target eq 'edit') {
@@ -141,7 +160,8 @@ sub end_essayresponse {
 	    $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';
+		    '}.]\textit{'.&mt('Leave blank on scoring form').
+		    '}\vskip 0 mm';
 	    }
 	    $result.= '\end{enumerate}';
 	}