--- loncom/interface/lonprintout.pm	2005/08/16 10:11:24	1.385
+++ loncom/interface/lonprintout.pm	2005/10/31 21:06:35	1.396
@@ -1,7 +1,7 @@
-#  The LearningOnline Network
+# The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.385 2005/08/16 10:11:24 foxr Exp $
+# $Id: lonprintout.pm,v 1.396 2005/10/31 21:06:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,8 +42,6 @@ use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
 
-my $resources_printed = '';
-
 #
 #   Convert a numeric code to letters
 #
@@ -87,11 +85,11 @@ sub letters_to_num {
 sub is_valid_numeric_code {
     my ($value, $num_digits) = @_;
     #   Remove leading/trailing whitespace;
-    $value =~ s/^\s*//;
-    $value =~ s/\s*$//;
+    $value =~ s/^\s*//g;
+    $value =~ s/\s*$//g;
     
     #  All digits?
-    if ($value =~ /^[0-9]+$/) {
+    if ($value !~ /^[0-9]+$/) {
 	return "Numeric code $value has invalid characters - must only be digits";
     }
     if (length($value) != $num_digits) {
@@ -508,6 +506,7 @@ sub character_chart {
     $result =~ s/&(prod|\#8719);/\\ensuremath\{\\prod\}/g;
     $result =~ s/&(sum|\#8721);/\\ensuremath\{\\sum\}/g;
     $result =~ s/&(minus|\#8722);/\\ensuremath\{-\}/g;
+    $result =~ s/–/\\ensuremath\{-\}/g;
     $result =~ s/&(lowast|\#8727);/\\ensuremath\{*\}/g;
     $result =~ s/&(radic|\#8730);/\\ensuremath\{\\surd\}/g;
     $result =~ s/&(prop|\#8733);/\\ensuremath\{\\propto\}/g;
@@ -822,6 +821,7 @@ sub print_latex_header {
     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+	     '\usepackage{wrapfig}'.
 	     '\usepackage{picins}\usepackage{calc}'."\n".
 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
@@ -903,6 +903,34 @@ sub unsupported {
 
 
 #
+# List of recently generated print files
+#
+
+sub recently_generated {
+    my $r=shift;
+    my $prtspool=$r->dir_config('lonPrtDir');
+    my $result;
+    opendir(DIR,$prtspool);
+    while (my $filename=readdir(DIR)) {
+	if ($filename=~/^$env{'user.name'}\_$env{'user.domain'}\_printout\_(\d+)\_.*.pdf$/) {
+	    my ($cdev,$cino,$cmode,$cnlink,
+		$cuid,$cgid,$crdev,$csize,
+		$catime,$cmtime,$cctime,
+		$cblksize,$cblocks)=stat($prtspool.'/'.$filename);
+            $result.="<a href='/prtspool/$filename'>".
+		&mt('Generated [_1] ([_2] bytes)',
+		    &Apache::lonlocal::locallocaltime($cctime),$csize).
+		    '</a><br />';
+	}
+    }
+    closedir(DIR);
+    if ($result) {
+	$r->print('<h4>'.&mt('Recently generated printouts').'</h4>'."\n".
+		  $result);
+    }
+}
+
+#
 #   Retrieve the hash of page breaks.
 #
 #  Inputs:
@@ -926,6 +954,7 @@ sub get_page_breaks  {
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
+    my $resources_printed = '';
     my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
     $r->print(<<ENDPART);
@@ -1363,6 +1392,8 @@ ENDPART
 	 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 $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
+
 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
 	 open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
 	 my ($code_type,$code_length)=('letter',6);
@@ -1384,14 +1415,17 @@ ENDPART
 	     $code_type=$result{"type\0$old_name"};
 	     @allcodes=split(',',$result{$old_name});
 	     $num_todo=scalar(@allcodes);
+	 } elsif ($selected_code) { # Selection value is always numeric.
+	     $num_todo = 1;
+	     @allcodes = ($selected_code);
 	 } elsif ($single_code) {
 
+	     $num_todo    = 1;	# Unconditionally one code to do.
 	     # 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 {
@@ -1625,7 +1659,7 @@ sub get_CODE {
     my $max='1'.'0'x$size;
     my $newcode;
     while(1) {
-	$newcode=sprintf("%06d",int(rand($max)));
+	$newcode=sprintf("%0".$size."d",int(rand($max)));
 	if (!exists($$all_codes{$newcode})) {
 	    $$all_codes{$newcode}=1;
 	    if ($type eq 'number' ) {
@@ -1846,21 +1880,27 @@ sub printHelper {
     $helper->declareVar("showallfoils");
 
     #  The page breaks can get loaded initially from the course environment:
+    # But we only do this in the initial state so that they are allowed to change.
+    #
 
-    if((!defined($env{"form.CURRENT_STATE"}))  ||
-       ($env{'form.CURRENT_STATE'} == "START")) {
-	$helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g.
-    }
-
-
+    $helper->{VARS}->{FINISHPAGE} = '';
     
     &Apache::loncommon::restore_course_settings('print',
 						{'pagebreaks'  => 'scalar',
 					         'lastprinttype' => 'scalar'});
-
     
-    if("$helper->{VARS}->{PRINT_TYPE}" eq "$env{'form.lastprinttype'}") {
-	$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+    
+    if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {
+	if (!defined ($env{"form.CURRENT_STATE"})) {
+	    
+	    $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+	} else {
+	    my $state = $env{"form.CURRENT_STATE"};
+	    if ($state eq "START") {
+		$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+	    }
+	}
+	
     }
     
     
@@ -1970,7 +2010,7 @@ sub printHelper {
     $helper->declareVar('SEQUENCE');
 
     # Useful for debugging: Dump the help vars
-#    $r->print(Dumper($helper->{VARS}));
+#     $r->print(Dumper($helper->{VARS}));
 #    $r->print($map);
 
     # If we're in a sequence...
@@ -2088,6 +2128,27 @@ CHOOSE_STUDENTS
 	    if ($name =~ /^type\0/) { next; }
 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
 	}
+
+
+        my %all_codes = &Apache::lonnet::get('CODEs',
+					     \@names, $cdom,$cnum);
+	my %code_values;
+	my @all_code_array;
+	foreach my $key (keys %all_codes) {
+	    %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);
+	    foreach my $key (keys %code_values) {
+		push (@all_code_array, "$key");
+	    }
+	}
+
+	my $code_selection = "<choice></choice>\n";
+	foreach my $code (sort {uc($a) cmp uc($b)} @all_code_array) {
+	    my $choice  = $code;
+	    if ($code =~ /^[A-Z]+$/) { # Alpha code
+		$choice = &letters_to_num($code);
+	    }
+	    $code_selection .= '   <choice computer="'.$choice.'">'.$code."</choice>\n";
+	}
 	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
 	my $codechoice='';
 	foreach my $line (<FH>) {
@@ -2110,7 +2171,8 @@ CHOOSE_STUDENTS
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
-            !\$helper->{'VARS'}{'SINGLE_CODE'}) {
+            !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
 	return undef;
@@ -2121,7 +2183,8 @@ CHOOSE_STUDENTS
     <string variable="SINGLE_CODE" size="10" defaultvalue="zzzz">
         <validator>
 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
-	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
+	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
 	   } else {
@@ -2130,6 +2193,12 @@ CHOOSE_STUDENTS
         </validator>
     </string>
     <message></td></tr><tr><td></message>
+    <message><b>Choose single code from list</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+    $code_selection
+    </dropdown>
+    <message></td></tr><tr><td></message>
     <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" />
@@ -2196,13 +2265,35 @@ CHOOSE_STUDENTS1
     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
-	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+	    !\$helper->{'VARS'}{'SINGLE_CODE'}                   &&
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
 	return undef;
        </validator>
     </string>
     <message></td></tr><tr><td></message>
+    <message><b>Value of CODE to print?</b></td><td></message>
+    <string variable="SINGLE_CODE" size="10" defaultvalue="zzzz">
+        <validator>
+	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
+	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+						      \$helper->{'VARS'}{'CODE_OPTION'});
+	   } else {
+	       return undef;	# Other forces control us.
+	   }
+        </validator>
+    </string>
+    <message></td></tr><tr><td></message>
+    <message><b>Choose single code from list</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+    $code_selection
+    </dropdown>
+    <message></td></tr><tr><td></message>
     <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" />
@@ -2265,6 +2356,8 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
+      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
+	</choicefunc>
       <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
@@ -2397,7 +2490,6 @@ RNDSEED
 	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
 	    
 	} 
-
     }
 
 
@@ -2424,7 +2516,9 @@ RNDSEED
     }    
 
     $r->print($helper->display());
-
+    if ($helper->{STATE} eq 'START') {
+	&recently_generated($r);
+    }
     &Apache::lonhelper::unregisterHelperTags();
 
     return OK;