--- loncom/interface/lonpickcode.pm	2005/08/12 22:14:12	1.7
+++ loncom/interface/lonpickcode.pm	2007/01/25 20:34:29	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a CODE from the list of possible CODEs
 #
-# $Id: lonpickcode.pm,v 1.7 2005/08/12 22:14:12 albertel Exp $
+# $Id: lonpickcode.pm,v 1.12 2007/01/25 20:34:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,7 @@ sub get_code_freq {
     $r->rflush();
     my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
-	my $line=&Apache::grades::scantron_get_line($scanlines,$i);
+	my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);
 	if ($line=~/^[\s\cz]*$/) { next; }
 	my $scan_record=
 	    &Apache::grades::scantron_parse_scanline($line,$i,
@@ -60,13 +60,6 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDDOCUMENT);
-$html
-  <head>
-    <title>The LearningOnline Network with CAPA</title>
-  </head>
-ENDDOCUMENT
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['curCODE','scantron_selectfile',
@@ -75,7 +68,9 @@ ENDDOCUMENT
 
     if  (!($env{'request.course.id'}) && 
 	 (&Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
-	$r->print('<body>Access not allowed.</body>');
+	$r->print(&Apache::loncommon::start_page().
+		  &mt('Access not allowed.').
+		  &Apache::loncommon::end_page());
         return OK;
     }
     if      ($env{'form.command'} eq 'codelist') {
@@ -85,14 +80,15 @@ ENDDOCUMENT
     } else {
 	&picking_a_code($r);
     }
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
 sub code_list {
     my ($r,$secondview)=@_;
     if (!$secondview) {
-	$r->print(&Apache::loncommon::bodytag("View CODEs"));
+	$r->print(&Apache::loncommon::start_page("View CODEs",undef,
+						 {'no_nav_bar' => 1}));
 	$r->print("<p>".&mt('Select a set of saved CODEs to view.')."</p>");
     } else {
 	$r->print("<p>".&mt('Select another set of saved CODEs to view.')."</p>");
@@ -110,7 +106,8 @@ sub code_list {
 
 sub show_codes {
     my ($r)=@_;
-    $r->print(&Apache::loncommon::bodytag("View CODEs"));
+    $r->print(&Apache::loncommon::start_page("View CODEs",undef,
+					     {'no_nav_bar' => 1}));
     my %codes=&Apache::grades::get_codes();
     $r->print("<h2>".$env{'form.scantron_CODElist'}."</h2>");
     $r->print('<pre>');
@@ -123,7 +120,8 @@ sub show_codes {
 
 sub picking_a_code {
     my ($r)=@_;
-    $r->print(&Apache::loncommon::bodytag("Selecting a CODE"));
+    $r->print(&Apache::loncommon::start_page("Selecting a CODE",undef,
+					     {'no_nav_bar' => 1}));
     $r->print(<<ENDSCRIPT);
 <script>
 function gochoose(newcode) {
@@ -145,7 +143,7 @@ ENDSCRIPT
     my %code_freq=&get_code_freq($r);
     my $num_matches=length($env{'form.curCODE'});
     for (my $i=$num_matches;$i>=0;$i--) {
-	my $to_print="<p> CODEs with $i matches</p>";
+	my $to_print="<p>".&mt("CODEs with [_1] matching letters",$i)."</p>";
 	$to_print.='<table border="1"><tr><td></td><td>CODE</td><td>exams using this CODE</td>';
 	my $print;
 	foreach my $code (sort(keys(%codes))) {
