--- loncom/homework/essayresponse.pm	2006/09/21 21:23:19	1.74
+++ loncom/homework/essayresponse.pm	2008/11/10 13:18:19	1.90
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.74 2006/09/21 21:23:19 albertel Exp $
+# $Id: essayresponse.pm,v 1.90 2008/11/10 13:18:19 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,13 +26,27 @@
 # http://www.lon-capa.org/
 #
 
+=pod
+
+=head1 NAME
+
+Apache::easyresponse
+
+=head1 SYNOPSIS
+
+Handler to evaluate essay (ungraded) style responses.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=cut
+
 package Apache::essayresponse;
 use strict;
 use Apache::lonxml();
 use Apache::lonnet;
 use Apache::lonlocal;
-use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
  
 
 BEGIN {
@@ -52,23 +66,32 @@ sub start_essayresponse {
 	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;
-	$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').
-            '</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)').
-	    '</label>'.
-            ' </td></tr>';
+	if ( $Apache::lonhomework::type eq 'survey' ) {
+	    $result.= '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" /> ';
+	}
+	$result.='<br /><table border="1">';
+	if ( $Apache::lonhomework::type ne 'survey' ) {
+	    $result.= '<tr><td>'.
+		'<label>'.
+		'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" /> '.
+		&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)').
+		'</label>'.
+		'</td></tr>';
+	}
+
 	if ($ncol > 0) {
 	    $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'}).
-                '</label><br />';
+		      &mt('Collaborators:').' <input type="text" size="70" max="80" name="HWCOL'.
+		      $part.'_'.$id.'" value="'.$coll.'" /><br />'.
+		      &mt('(Enter a maximum of [quant,_1,collaborator] using username or username:domain, e.g. smithje or smithje:[_2].)',$ncol,$env{'user.domain'});
+            if ($ncol > 1) {
+                $result .= '<br />'.&mt('If entering more than one, use spaces to separate the collaborators.');
+            }
+            $result .= '</label><br />';
 	    $result .= &check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
 	    $result .='</td></tr>';
 	}
@@ -141,13 +164,14 @@ sub end_essayresponse {
 #
                 if ($award eq 'SUBMITTED') {
 		    my ($symb,$crsid,$domain,$name)=
-			&Apache::lonxml::whichuser();
+			&Apache::lonnet::whichuser();
 		    if ($crsid) {
-			my $akey=$name.'.'.$domain.'.'.$crsid;
+			my $akey=join('.',&escape($name),&escape($domain),
+				      &escape($crsid));
 			my $essayurl=
 			    &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
 			my ($adom,$aname,$apath)=
-			    ($essayurl=~/^(\w+)\/(\w+)\/(.*)$/);
+			    ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
                         $apath=&escape($apath);
 			$apath=~s/\W/\_/gs;
 			&Apache::lonnet::put('nohist_essay_'.$apath,
@@ -165,19 +189,61 @@ sub end_essayresponse {
 
     } elsif ($target eq 'answer') {
 	$result.=&Apache::response::answer_header($$tagstack[-1]);
-	$result.=&Apache::response::answer_part($$tagstack[-1],'');
+	my $answer = &mt('Essay will be hand graded.');
+	$result.=&Apache::response::answer_part($$tagstack[-1],$answer,
+						{'no_verbatim' => 1});
 	$result.=&Apache::response::answer_footer($$tagstack[-1]);
     }
+    if ($target eq 'web') {
+	&Apache::response::setup_prior_tries_hash(\&format_prior_response,
+						  ['portfiles',
+						   'uploadedurl']);
+    }
 
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::increment_counter($increment);
+	&Apache::lonxml::increment_counter($increment, "$part.$id");
+
+	if ($target eq 'analyze') {
+            $Apache::lonhomework::analyze{"$part.$id.type"} = 'essayresponse';
+	    &Apache::lonhomework::set_bubble_lines();
+	}
     }
     &Apache::response::end_response;
 
     return $result;
 }
 
+sub format_prior_response {
+    my ($mode,$answer,$other_data) = @_;
+    my $output;
+
+    my (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser();
+    my $port_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
+
+    my $file_list;
+
+    foreach my $file (split(/\s*,\s*/,
+			    $other_data->[0].','.$other_data->[1])) {
+	next if ($file!~/\S/);
+	if ($file !~ m{^/uploaded/}) { $file=$port_url.$file; }
+	$file=~s|/+|/|g;
+	&Apache::lonnet::allowuploaded('/adm/essayresponse',$file);
+	$file_list.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+	    &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
+	    '</a></span></li>'."\n";
+    }
+    if ($file_list) {
+	$output.= &mt('Submitted Files').'<ul>'.$file_list.'</ul>';
+    }
+    if ($answer =~ /\S/) {
+	$output.='<p>'.&mt('Submitted text').
+	    '<blockquote>'.$answer.'</blockquote></p>';
+    }
+
+    return '<div class="LC_prior_essay">'.$output.'</div>';
+}
+
 sub file_submission {
     my ($part,$id,$which,$award,$uploadedflag)=@_;
     my $files;
@@ -203,7 +269,7 @@ sub file_submission {
 	    $uploadedfiletypes=','.$uploadedfiletypes.',';
 	    foreach my $file (@submitted_files) {
 		my ($extension)=($file=~/\.(\w+)$/);
-		unless ($uploadedfiletypes=~/\,$extension\,/i) {
+		unless ($uploadedfiletypes=~/\,\s*\Q$extension\E\s*\,/i) {
 		    $$award='INVALID_FILETYPE';
 		}
 	    }
@@ -212,7 +278,7 @@ sub file_submission {
 	    $$uploadedflag=1;
 	}
 	if ($$award ne 'INVALID_FILETYPE' && $which eq 'portfiles') {
-	    my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	    my ($symb,$crsid,$domain,$name)=&Apache::lonnet::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);
@@ -226,7 +292,7 @@ sub file_submission {
 	}
     } elsif ($which eq 'portfiles' &&
 	     $Apache::lonhomework::history{"resource.$part.$id.$which"}) {
-	my ($symb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
+	my ($symb,$crsid,$domain,$name)=&Apache::lonnet::whichuser();
 	&Apache::lonnet::unmark_as_readonly($domain,$name,[$symb,$crsid]);
 	$Apache::lonhomework::results{"resource.$part.$id.$which"}="";
     }
@@ -238,27 +304,43 @@ sub check_collaborators {
 					$env{'course.'.$env{'request.course.id'}.'.domain'},
 					$env{'course.'.$env{'request.course.id'}.'.num'});
     my (@badcollaborators,$result);
-    my (@collaborators) = split(/\,?\s+/,$coll);
-    foreach (@collaborators) {
-	my $collaborator = $_;
-	if (/@/) {
-	    $collaborator =~ s/@/:/;
+  
+    my (@collaborators) = split(/,?\s+/,$coll);
+    foreach my $entry (@collaborators) {
+        my $collaborator;
+	if ($entry =~ /:/) {
+	    $collaborator = $entry;
 	} else {
-	    $collaborator = $_.':'.$env{'user.domain'};
+	    $collaborator = $entry.':'.$env{'user.domain'};
 	}
-	push @badcollaborators, $_ if (!grep /^$collaborator/i,keys %classlist);
+        if ($collaborator !~ /^$match_username:$match_domain$/) {
+            if (!grep(/^\Q$entry\E$/,@badcollaborators)) {
+	        push(@badcollaborators,$entry);
+            }
+        } elsif (!grep(/^\Q$collaborator\E$/i,keys(%classlist))) {
+            if (!grep(/^\Q$entry\E$/,@badcollaborators)) {
+                push(@badcollaborators,$entry);
+            }
+        }
     }
     
-    if (scalar(@badcollaborators)) {
-	$result = '<table border="0"><tr bgcolor="#ffbbbb"><td> The following user'.
-	    (scalar(@badcollaborators) > 1 ? 's are' : ' is').' invalid: '.
-	    join(', ',@badcollaborators).'. Please correct.</td></tr></table>';
+    my $numbad = scalar(@badcollaborators);
+    if ($numbad) {
+	$result = '<table border="0"><tr bgcolor="#ffbbbb"><td>';
+        if ($numbad == 1) {
+            $result .= &mt('The following user is invalid:');
+        } else {
+            $result .= &mt('The following [_1] users are invalid:',$numbad);
+        }
+	$result .= ' '.join(', ',@badcollaborators).'. '.&mt('Please correct.').
+                   '</td></tr></table>';
     }
     my $toomany = scalar(@collaborators) - $ncol;
     if ($toomany > 0) {
 	$result .= '<table border="0"><tr bgcolor="#ffbbbb"><td>'.
-	    'You have too many collaborators. Please remove '.$toomany.' collaborator'.
-	    ($toomany > 1 ? 's' :'').'.</td></tr></table>';
+	           &mt('You have too many collaborators.').' '.
+                   &mt('Please remove [quant,_1,collaborator].',$toomany).
+	           '</td></tr></table>';
     }
     return $result;
 }