--- loncom/homework/inputtags.pm	2008/03/03 19:37:27	1.240
+++ loncom/homework/inputtags.pm	2008/11/16 02:46:25	1.248
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.240 2008/03/03 19:37:27 www Exp $
+# $Id: inputtags.pm,v 1.248 2008/11/16 02:46:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,7 +306,9 @@ sub start_textline {
 		$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
 	    }
 	    $oldresponse = &HTML::Entities::encode($oldresponse,'<>&"');
-
+            $oldresponse =~ s/^\s+//;
+            $oldresponse =~ s/\s+$//;
+            $oldresponse =~ s/\s+/ /g;
 	    if ($Apache::lonhomework::type ne 'exam') {
 		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 		$result='';
@@ -356,8 +358,15 @@ sub start_textline {
 	     && $Apache::lonhomework::type ne 'exam') {
 	my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
-	$result='\framebox['.$size.'][s]{\tiny\strut}';
-
+	if ($env{'form.pdfFormFields'} eq 'yes') {
+            my $fieldname = $env{'request.symb'}.
+                                 '&part_'. $Apache::inputtags::part.
+                                 '&textresponse'.
+                                 '&HWVAL_' . $Apache::inputtags::response['-1'];
+            $result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
+        } else {
+            $result='\framebox['.$size.'][s]{\tiny\strut}';
+        }
     } elsif ($target eq 'tex' 
 	     && $Apache::lonhomework::type eq 'exam'
 	     && &needs_exam_box($tagstack)) {
@@ -516,7 +525,8 @@ sub valid_award {
 			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
 			       'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', 
 			       'MISORDERED_RANK', 'INVALID_FILETYPE',
-			       'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
+                               'EXCESS_FILESIZE', 'DRAFT',
+			       'SUBMITTED', 'ASSIGNED_SCORE',
 			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
 	if ($award eq $possibleaward) { return 1; }
     }
@@ -530,8 +540,8 @@ sub valid_award {
 		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',
 		  'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
-		  'INVALID_FILETYPE', 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
-		  'APPROX_ANS', 'EXACT_ANS');
+		  'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
+                  'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
     my $i=0;
     my %fwd_awards = map { ($_,$i++) } @awards;
     my $max=scalar(@awards);
@@ -728,10 +738,13 @@ sub decideoutput {
 	$button = 1;
     } elsif ($award eq 'MISSING_ANSWER') {
 	$message = &mt('Some items were not submitted.');
+        if ($target ne 'tex') {
+           $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
+        }
 	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
     } elsif ($award eq 'ERROR') {
-	$message = &mt('An error occured while grading your answer.');
+	$message = &mt('An error occurred while grading your answer.');
 	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
     } elsif ($award eq 'TOO_LONG') {
@@ -743,12 +756,17 @@ sub decideoutput {
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'MISORDERED_RANK') {
-	$message = &mt('You have provided an invalid ranking');
-	if ($target ne 'tex') {
-	    $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems'));
-	}
+        $message = &mt('You have provided an invalid ranking.');
+        if ($target ne 'tex') {
+            $message.=' '.&mt('Please refer to [_1]',&Apache::loncommon::help_open_topic('Ranking_Problems',&mt('help on ranking problems')));
+        }
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
+    } elsif ($award eq 'EXCESS_FILESIZE') {
+        $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
+        $css_class=$possible_class{'not_charged_try'};
+        $button=1;
+
     } elsif ($award eq 'INVALID_FILETYPE') {
 	$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
 	$css_class=$possible_class{'not_charged_try'};
@@ -847,7 +865,12 @@ sub decideoutput {
 	$added_computer_text=1;
     }
     if ($Apache::lonhomework::type eq 'practice') {
-       $message.='<br />'.&mt('Submissions to practice problems are not permanently recorded.');
+       if ($target eq 'web') {
+           $message .= '<br />';
+       } else {
+           $message .= ' ';      
+       }
+       $message.=&mt('Submissions to practice problems are not permanently recorded.');
     }
 
     return ($button,$css_class,$message,$previousmsg);
@@ -1079,7 +1102,7 @@ sub grade {
 	    my ($match) =
 		&previous_match(\@Apache::inputtags::previous_version,
 				scalar(@Apache::inputtags::response));
-	    
+
 	    if ($match) {
 		$previously_used = 'PREVIOUSLY_LAST';
 		foreach my $value (@Apache::inputtags::previous) {