--- loncom/interface/lonprintout.pm 2005/07/26 10:50:32 1.380 +++ loncom/interface/lonprintout.pm 2005/08/15 22:39:43 1.383 @@ -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.383 2005/08/15 22:39:43 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,6 +44,100 @@ use Apache::lonlocal; my $resources_printed = ''; +# Determine if a code is a valid numeric code. Valid +# numeric codes must be comprised entirely of digits and +# have a maximum number of allowable digits. +# +# Parameters: +# value - proposed code value. +# max_digits - Maximum digits allowed. +# +sub is_valid_numeric_code { + my ($value, $max_digits) = @_; + # Remove leading/trailing whitespace; + $value =~ s/^\s*//; + $value =~ s/\s*$//; + + # All digits? + + if ($value =~ /^[0-9]+$/) { + if (length($value) <= $max_digits) { + return undef; + } else { + return "Numeric code $value has too many digits (max = $max_digits)"; + } + } else { + return "Numeric code $value has invalid characters - must only be digits"; + } +} +# Determines if a code is a valid alhpa code. Alpha codes +# are ciphers that map [A-J,a-j] -> 0..9 0..9. +# They also have a maximum digit count. +# Parameters: +# value - Proposed code value. +# max_letters - Maximum number of letters. +# Note: +# leading and trailing whitespace are ignored. +# +sub is_valid_alpha_code { + my ($value, $max_letters) = @_; + + # strip leading and trailing spaces. + + $value =~ s/^\s*//g; + $value =~ s/\s*$//g; + + # All alphas in the right range? + + if ($value =~ /^[A-J,a-j]+$/) { + if (length($value) <= $max_letters) { + return undef; + } else { + return "Letter code $value has too many letters (max = $max_letters)"; + } + } else { + return "Invalid letter code $value must only contain A-J"; + } +} + +# Determine if a code entered by the user in a helper is valid. +# valid depends on the code type and the type of code selected. +# The type of code selected can either be numeric or +# Alphabetic. If alphabetic, the code, in fact is a simple +# substitution cipher for the actual numeric code: 0->A, 1->B ... +# We'll be nice and be case insensitive for alpha codes. +# Parameters: +# code_value - the value of the code the user typed in. +# code_option - The code type selected from the set in the scantron format +# table. +# Returns: +# undef - The code is valid. +# other - An error message indicating what's wrong. +# +sub is_code_valid { + my ($code_value, $code_option) = @_; + my ($code_type, $code_length) = ('letter', 6); # defaults. + open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); + foreach my $line () { + 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 $valid; + if ($code_type eq 'number') { + $valid = &is_valid_numeric_code($code_value, $code_length); + } else { + $valid = &is_valid_alpha_code($code_value, $code_length); + } + + + return "Entering a single code is not supported (yet): $code_type $code_length $valid"; +} + # Compare two students by name. The students are in the form # returned by the helper: # user:domain:section:last, first:status @@ -1244,23 +1338,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 () { + 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 +1388,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 +1595,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 +2059,22 @@ CHOOSE_STUDENTS my $namechoice=''; foreach my $name (sort {uc($a) cmp uc($b)} @names) { if ($name =~ /^error: 2 /) { next; } + if ($name =~ /^type\0/) { next; } $namechoice.=''.$name.''; } + open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); + my $codechoice=''; + foreach my $line () { + my ($name,$description,$code_type,$code_length)= + (split(/:/,$line))[0,1,2,4]; + if ($code_length > 0 && + $code_type =~/^(letter|number|-1)/) { + $codechoice.=''.$description.''; + } + } + if ($codechoice eq '') { + $codechoice='Default'; + } &Apache::lonxml::xmlparse($r, 'helper', < PAGESIZE @@ -1949,16 +2083,38 @@ CHOOSE_STUDENTS if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) && - !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) { + !\$helper->{'VARS'}{'REUSE_OLD_CODES'} && + !\$helper->{'VARS'}{'SINGLE_CODE'}) { return "You need to specify the number of assignments to print"; } return undef; + Value of CODE to print? + + + # Not sure of exact call context so... + use Apache::lonprintout; + if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'} && + !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) { + return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'}, + \$helper->{'VARS'}{'CODE_OPTION'}); + } else { + return undef; # Other forces control us. + } + + + Names to store the CODEs under for later: + + Bubble sheet type: + + + $codechoice +
Reprint a set of saved CODEs: @@ -2026,6 +2182,12 @@ CHOOSE_STUDENTS1 Names to store the CODEs under for later: + + Bubble sheet type: + + + $codechoice +
Reprint a set of saved CODEs: