--- loncom/homework/grades.pm	2003/09/19 21:54:07	1.140
+++ loncom/homework/grades.pm	2003/10/08 18:25:18	1.143
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.140 2003/09/19 21:54:07 albertel Exp $
+# $Id: grades.pm,v 1.143 2003/10/08 18:25:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -185,7 +185,7 @@ sub cleanRecord {
 	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
 	}
-	return '<br /><br /><blockquote>'.&keywords_highlight($answer).'</blockquote>';
+	return '<br /><br /><blockquote><pre>'.&keywords_highlight($answer).'</pre></blockquote>';
     }
     return $answer;
 }
@@ -3189,7 +3189,7 @@ sub scantron_selectphase {
     my $result;
     $result.= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
-  <input type="hidden" name="command" value="scantron_process" />
+  <input type="hidden" name="command" value="scantron_validate" />
   $default_form_data
   <table width="100%" border="0">
     <tr>
@@ -3219,7 +3219,7 @@ sub scantron_selectphase {
       </td>
     </tr>
   </table>
-  <input type="submit" value="Submit" />
+  <input type="submit" value="Validate Scantron Records" />
 </form>
 $grading_menu_button
 SCANTRONFORM
@@ -3337,6 +3337,11 @@ sub scantron_filter {
 #and then get the instructor to fix all of these errors, then grade
 #the corrected one, I'll still need to catch error conditions, but
 #maybe most will taken care even before we start
+
+sub scantron_validate_file {
+    my ($r) = @_;
+}
+
 sub scantron_process_students {
     my ($r) = @_;
     my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($ENV{'form.selectpage'});
@@ -3624,9 +3629,9 @@ sub handler {
 
     undef(%perm);
     if ($ENV{'browser.mathml'}) {
-	$request->content_type('text/xml');
+	&Apache::loncommon::content_type($request,'text/xml');
     } else {
-	$request->content_type('text/html');
+	&Apache::loncommon::content_type($request,'text/html');
     }
     $request->send_http_header;
     return '' if $request->header_only;
@@ -3721,6 +3726,8 @@ sub handler {
 	    }
 	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
 	    $request->print(&scantron_selectphase($request));
+	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+	    $request->print(&scantron_validate_file($request));
 	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
 	    $request->print(&scantron_process_students($request));
 	} elsif ($command) {