--- loncom/interface/lonpickcode.pm	2004/04/24 09:01:52	1.3
+++ loncom/interface/lonpickcode.pm	2004/05/04 14:17:18	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a CODE from the list of possible CODEs
 #
-# $Id: lonpickcode.pm,v 1.3 2004/04/24 09:01:52 albertel Exp $
+# $Id: lonpickcode.pm,v 1.4 2004/05/04 14:17:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,33 +48,12 @@ sub get_code_freq {
 	    &Apache::grades::scantron_parse_scanline($line,$i,
 						     \%scantron_config,
 						     $scan_data,1);
-	$codes{$$scan_record{'scantron.CODE'}}++;
+	push(@{$codes{$$scan_record{'scantron.CODE'}}},$$scan_record{'scantron.PaperID'});
 
     }
     return %codes;
 }
 
-sub get_codes {
-    my $old_name=$ENV{'form.scantron_CODElist'};
-    my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-    my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
-    my %allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});
-    return %allcodes;
-}
-
-sub num_matches {
-    my ($code) = @_;
-    my $orig=$ENV{'form.curCODE'};
-    my @code=split(//,$code);
-    my @orig=split(//,$orig);
-    my $same=0;
-    for (my $i=0;$i<scalar(@code);$i++) {
-	if ($code[$i] eq $orig[$i]) { $same++; }
-    }
-    return $same;
-}
-
 sub handler {
     my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');
@@ -118,23 +97,28 @@ ENDSCRIPT
 
     $r->print("<p>The CODE on the paper is <tt><b>".$ENV{'form.curCODE'}.
 	      "</b></tt>. Please Select a new one.</p>\n".'<form>');
-    my %codes=&get_codes();
+    my %codes=&Apache::grades::get_codes();
     my %code_freq=&get_code_freq($r);
-    my $num_matches=&num_matches($ENV{'form.curCODE'});
+    my $num_matches=length($ENV{'form.curCODE'});
     for (my $i=$num_matches;$i>=0;$i--) {
 	my $to_print="<p> CODEs with $i matches</p>";
-	$to_print.='<table border="1"><tr><td></td><td>CODE</td><td># of exams using this CODE</td>';
+	$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))) {
-	    if (&num_matches($code) != $i) { next; }
+	    if (&Apache::grades::num_matches($ENV{'form.curCODE'},$code) != $i) { next; }
 	    $print=1;
-	    my $count=$code_freq{$code};
-	    if (!$count) { $count=0; }
+	    my ($count,$list);
+	    if (!ref($code_freq{$code})) {
+		$count=0;
+	    } else {
+		$count=scalar(@{$code_freq{$code}});
+		$list=' - '.join(', ',@{$code_freq{$code}});
+	    }
 	    $to_print.='<tr><td>'.
 		      '<input type="button" value="'.&mt('Select').
 		      '" onClick="gochoose(\''.$code.'\')" /></td>'.
-		      '<td><tt>'.$code.'</tt></td><td> <tt>'.$count.
-		      '</tt></td></tr>';
+		      '<td><tt>'.$code.'</tt></td><td>'.$count.
+		      $list.'</td></tr>';
 	    delete($codes{$code});
 	}
 	$to_print.='</table>';