--- loncom/interface/lonprintout.pm 2005/08/15 22:39:43 1.383 +++ loncom/interface/lonprintout.pm 2005/08/16 10:25:15 1.386 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.383 2005/08/15 22:39:43 foxr Exp $ +# $Id: lonprintout.pm,v 1.386 2005/08/16 10:25:15 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,43 +44,72 @@ use Apache::lonlocal; my $resources_printed = ''; +# +# Convert a numeric code to letters +# +sub num_to_letters { + my ($num) = @_; + my @nums= split('',$num); + my @num_to_let=('A'..'Z'); + my $word; + foreach my $digit (@nums) { $word.=$num_to_let[$digit]; } + return $word; +} +# Convert a letter code to numeric. +# +sub letters_to_num { + my ($letters) = @_; + my @letters = split('', uc($letters)); + my %substitution; + my $digit = 0; + foreach my $letter ('A'..'J') { + $substitution{$letter} = $digit; + $digit++; + } + # The substitution is done as below to preserve leading + # zeroes which are needed to keep the code size exact + # + my $result =""; + foreach my $letter (@letters) { + $result.=$substitution{$letter}; + } + return $result; +} + # 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. +# have a correct number of digits. # # Parameters: # value - proposed code value. -# max_digits - Maximum digits allowed. +# num_digits - Number of digits required. # sub is_valid_numeric_code { - my ($value, $max_digits) = @_; + my ($value, $num_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"; } + if (length($value) != $num_digits) { + return "Numeric code $value incorrect number of digits (correct = $num_digits)"; + } + return undef; } # 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. +# They also have a correct digit count. # Parameters: # value - Proposed code value. -# max_letters - Maximum number of letters. +# num_letters - correct number of letters. # Note: # leading and trailing whitespace are ignored. # sub is_valid_alpha_code { - my ($value, $max_letters) = @_; + my ($value, $num_letters) = @_; # strip leading and trailing spaces. @@ -88,16 +117,13 @@ sub is_valid_alpha_code { $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 { + if ($value !~ /^[A-J,a-j]+$/) { return "Invalid letter code $value must only contain A-J"; } + if (length($value) != $num_letters) { + return "Letter code $value has incorrect number of letters (correct = $num_letters)"; + } + return undef; } # Determine if a code entered by the user in a helper is valid. @@ -129,13 +155,11 @@ sub is_code_valid { } my $valid; if ($code_type eq 'number') { - $valid = &is_valid_numeric_code($code_value, $code_length); + return &is_valid_numeric_code($code_value, $code_length); } else { - $valid = &is_valid_alpha_code($code_value, $code_length); + return &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 @@ -1338,7 +1362,7 @@ 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 $single_code = $helper->{'VARS'}->{'SINGLE_CODE'}; my $code_option=$helper->{'VARS'}->{'CODE_OPTION'}; open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab'); my ($code_type,$code_length)=('letter',6); @@ -1360,6 +1384,16 @@ ENDPART $code_type=$result{"type\0$old_name"}; @allcodes=split(',',$result{$old_name}); $num_todo=scalar(@allcodes); + } elsif ($single_code) { + + # If an alpha code have to convert to numbers so it can be + # converted back to letters again :-) + # + if ($code_type ne 'number') { + $single_code = &letters_to_num($single_code); + $num_todo = 1; + } + @allcodes = ($single_code); } else { my %allcodes; srand($seed); @@ -1585,14 +1619,6 @@ $r->print(<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'}, @@ -2172,13 +2196,27 @@ CHOOSE_STUDENTS1 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? + + + 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: