--- loncom/interface/lonprintout.pm	2005/07/26 10:50:32	1.380
+++ loncom/interface/lonprintout.pm	2005/08/12 21:33:41	1.381
@@ -1,7 +1,7 @@
 #  The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.380 2005/07/26 10:50:32 foxr Exp $
+# $Id: lonprintout.pm,v 1.381 2005/08/12 21:33:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1244,23 +1244,41 @@ ENDPART
 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
+	 
+	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
+	 open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+	 my ($code_type,$code_length)=('letter',6);
+	 foreach my $line (<FH>) {
+	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
+	     if ($name eq $code_option) {
+		 $code_length=$length;
+		 if ($type eq 'number') { $code_type = 'number'; }
+	     }
+	 }
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
 	 my $seed=time+($$<<16)+($$);
 	 my @allcodes;
 	 if ($old_name) {
-	     my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
+	     my %result=&Apache::lonnet::get('CODEs',
+					     [$old_name,"type\0$old_name"],
+					     $cdom,$cnum);
+	     $code_type=$result{"type\0$old_name"};
 	     @allcodes=split(',',$result{$old_name});
 	     $num_todo=scalar(@allcodes);
 	 } else {
 	     my %allcodes;
 	     srand($seed);
 	     for (my $i=0;$i<$num_todo;$i++) {
-		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,'6');
+		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
+					    $code_type);
 	     }
 	     if ($code_name) {
 		 &Apache::lonnet::put('CODEs',
-				      {$code_name =>join(',',keys(%allcodes))},
+				      {
+					$code_name =>join(',',keys(%allcodes)),
+					"type\0$code_name" => $code_type
+				      },
 				      $cdom,$cnum);
 	     }
 	     @allcodes=keys(%allcodes);
@@ -1276,7 +1294,11 @@ ENDPART
 	 my $count=0;
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
-	     $moreenv{'CODE'}=&num_to_letters($code);
+	     if ($code_type eq 'number') { 
+		 $moreenv{'CODE'}=$code;
+	     } else {
+		 $moreenv{'CODE'}=&num_to_letters($code);
+	     }
 	     my ($output,$fullname, $printed)=
 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
 				  \@master_seq,$flag_latex_header_remove,
@@ -1479,14 +1501,18 @@ sub num_to_letters {
 }
 
 sub get_CODE {
-    my ($all_codes,$num,$seed,$size)=@_;
+    my ($all_codes,$num,$seed,$size,$type)=@_;
     my $max='1'.'0'x$size;
     my $newcode;
     while(1) {
 	$newcode=sprintf("%06d",int(rand($max)));
 	if (!exists($$all_codes{$newcode})) {
 	    $$all_codes{$newcode}=1;
-	    return &num_to_letters($newcode);
+	    if ($type eq 'number' ) {
+		return $newcode;
+	    } else {
+		return &num_to_letters($newcode);
+	    }
 	}
     }
 }
@@ -1939,8 +1965,22 @@ CHOOSE_STUDENTS
 	my $namechoice='<choice></choice>';
 	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
 	    if ($name =~ /^error: 2 /) { next; }
+	    if ($name =~ /^type\0/) { next; }
 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
 	}
+	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+	my $codechoice='';
+	foreach my $line (<FH>) {
+	    my ($name,$description,$code_type,$code_length)=
+		(split(/:/,$line))[0,1,2,4];
+	    if ($code_length > 0 && 
+		$code_type =~/^(letter|number|-1)/) {
+		$codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';
+	    }
+	}
+	if ($codechoice eq '') {
+	    $codechoice='<choice computer="default">Default</choice>';
+	}
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
   <state name="CHOOSE_ANON1" title="Select Students and Resources">
     <nextstate>PAGESIZE</nextstate>
@@ -1959,6 +1999,12 @@ CHOOSE_STUDENTS
     <message><b>Names to store the CODEs under for later:</b></message>
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+    <message></td></tr><tr><td></message>
+    <message><b>Bubble sheet type:</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+    $codechoice
+    </dropdown>
     <message></td></tr></table></message>
     <message><hr width='33%' /></message>
     <message><b>Reprint a set of saved CODEs:</b></message>
@@ -2026,6 +2072,12 @@ CHOOSE_STUDENTS1
     <message><b>Names to store the CODEs under for later:</b></message>
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+    <message></td></tr><tr><td></message>
+    <message><b>Bubble sheet type:</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+    $codechoice
+    </dropdown>
     <message></td></tr></table></message>
     <message><hr width='33%' /></message>
     <message><b>Reprint a set of saved CODEs:</b></message>