--- loncom/interface/lonprintout.pm	2010/05/24 09:21:18	1.577
+++ loncom/interface/lonprintout.pm	2011/06/22 11:00:47	1.595
@@ -1,8 +1,8 @@
-#
+
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.577 2010/05/24 09:21:18 foxr Exp $
+# $Id: lonprintout.pm,v 1.595 2011/06/22 11:00:47 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,13 +45,13 @@ use Apache::londefdef;
 use File::Basename;
 
 use HTTP::Response;
-
 use LONCAPA::map();
 use POSIX qw(strftime);
 use Apache::lonlocal;
 use Carp;
 use LONCAPA;
 
+
 my %perm;
 my %parmhash;
 my $resources_printed;
@@ -76,7 +76,146 @@ my $font_size = 'normalsize';	# Default
 
 #----------------------------  Helper helpers. -------------------------
 
-#  Returns the text needd for a student chooser.
+# BZ5209:
+#    Create the states needed to run the helper for incomplete problems from
+#    the current folder for selected students.
+#    This includes:
+#    -  A resource selector limited to problems (incompleteness must be
+#       calculated on a student per student basis.
+#    -  A student selector.
+#    -  Tie in to the FORMAT of the print job.
+#
+# States:
+#   CHOOSE_INCOMPLETE_PEOPLE_SEQ      - Resource selection.
+#   CHOOSE_STUDENTS_INCOMPLETE        - Student selection.
+#   CHOOSE_STUDENTS_INCOMPLETE_FORMAT - Format selection
+# Parameters:
+#    helper - the helper which already contains info about the current folder we can
+#             purloin.
+#    url    - Top url of the sequence
+# Return:
+#     XML that can be parsed by the helper to drive the state machine.
+#
+sub create_incomplete_folder_selstud_helper($helper)
+{
+    my ($helper, $map)  = @_;
+
+
+    my $symbFilter = '$res->shown_symb()';
+    my $selFilter   = '$res->is_problem()';
+
+
+    my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_PEOPLE_SEQ',
+						      'Select problem(s) to print',
+						      'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+						      'RESOURCES',
+						      'CHOOSE_STUDENTS_INCOMPLETE',
+						      $map,
+						      $selFilter,
+						      '',
+						      $symbFilter, 
+						      '');
+
+    my $student_chooser = &generate_student_chooser('CHOOSE_STUDENTS_INCOMPLETE',
+						 'student_sort',
+						 'STUDENTS',
+						 'CHOOSE_STUDENTS_INCOMPLETE_FORMAT');
+
+    my $format_chooser = &generate_format_selector($helper,
+						'Format of the print job',
+						'','CHOOSE_STUDENTS_INCOMPLETE_FORMAT'); # end state.
+
+    return $resource_chooser . $student_chooser . $format_chooser;
+}  
+
+
+# BZ 5209
+#     Create the states needed to run the helper for incomplete problems from
+#     the current folder for selected students.
+#     This includes:
+#     - A resource selector limited to problems.  (incompleteness must be calculated
+#       on a student per student basis.
+#     - A student selector.
+#     - Tie in to format for the print job.
+# States:
+#    INCOMPLETE_PROBLEMS_COURSE_RESOURCES - Resource selector.
+#    INCOMPLETE_PROBLEMS_COURSE_STUDENTS  - Student selector.
+#    INCOMPLETE_PROBLEMS_COURSE_FORMAT    - Format selection.
+#
+# Parameters:
+#   helper   - Helper we are creating states for.
+# Returns:
+#   Text that can be parsed by the helper.
+# 
+
+sub create_incomplete_course_helper {
+    my $helper = shift;
+
+    my $filter = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
+    my $symbfilter = '$res->shown_symb()';
+    
+    my $resource_chooser = &generate_resource_chooser('INCOMPLETE_PROBLEMS_COURSE_RESOURCES',
+						      'Select problem(s) to print',
+						      'multichoice = "1" suppressEmptySequences="0" addstatus="1" closeallpagtes="1"',
+						      'RESOURCES',
+						      'INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
+						      '',
+						      $filter,
+						      '',
+						      $symbfilter,
+						      '');
+
+    my $people_chooser  = &generate_student_chooser('INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
+						    'student_sort',
+						    'STUDENTS',
+						    'INCOMPLETE_PROBLEMS_COURSE_FORMAT');
+
+    my $format = &generate_format_selector($helper,
+					   'Format of the print job',
+					   '',
+					   'INCOMPLETE_PROBLEMS_COURSE_FORMAT'); # end state.
+
+    return $resource_chooser . $people_chooser . $format;
+
+
+}
+
+# BZ5209 
+#   Creates the states needed to run the print helper for a student
+#   that wants to print his incomplete problems from the current folder.
+# Parameters:
+#   $helper - helper we are generating states for.
+#   $map    - The map for which the student wants incomplete problems.
+# Returns:
+#   XML that defines the helper states being created.
+#
+# States:
+#   CHOOSE_INCOMPLETE_SEQ  - Resource selector.
+#
+sub create_incomplete_folder_helper {
+    my ($helper, $map) = @_;
+
+    my $filter    = '$res->is_problem()';
+    $filter      .= ' && $res->resprintable() ';
+    $filter      .= ' && $res->is_incomplete() ';
+
+    my $symfilter = '$res->shown_symb()';
+
+    my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_SEQ',
+						      'Select problem(s) to print',
+						      'multichoice="1", toponly ="1", addstatus="1", closeallpages="1"',
+						      'RESOURCES',
+						      'PAGESIZE',
+						      $map,
+						      $filter, '', 
+						      $symfilter,
+						      '');
+
+    return $resource_chooser;
+}
+
+
+#  Returns the text neded for a student chooser.
 #  that text must still be parsed by the helper xml parser.
 # Parameters:
 #   this_state   - State name of the chooser.
@@ -196,14 +335,19 @@ sub generate_code_selector {
     <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
-	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'} ) {
+
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -229,7 +373,7 @@ sub generate_code_selector {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
 	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
-	      return 'Specifying a code name is incompatible with what you have specified above';
+	      return 'Specifying a code name is incompatible with specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }
@@ -251,8 +395,138 @@ CHOOSE_ANON1
    return $result;
 }
 
+sub generate_format_selector {
+    my ($helper,$title,$nextstate, $thisstate) = @_;
+    my $secpdfoption;
+    my $state = 'PRINT_FORMATTING';
+    if ($thisstate) {
+	$state = $thisstate;
+    }
+    unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
+            ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
+            ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
+        $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</choice>';
+    }
+    return <<RESOURCE_SELECTOR;
+    <state name="$state" title="$title">
+    $nextstate
+    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+    <choices variable="EMPTY_PAGES">
+      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
+    </choices>
+    <nextstate>PAGESIZE</nextstate>
+    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
+    <choices variable="SPLIT_PDFS">
+       <choice computer="all">All assignments in a single PDF file</choice>
+       $secpdfoption
+       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+            Specify the number of assignments per PDF:</choice>
+    </choices>
+    </state>
+RESOURCE_SELECTOR
+}
+
 #-----------------------------------------------------------------------
 
+# Determine if a resource is incomplete given the map:
+# Parameters:
+#   $username - Name of user for whom we are checking.
+#   $domain   - Domain of user we are checking.
+#   $map - map name.
+# Returns:
+#     0 - map is not incomplete.
+#     1 - map is incomplete.
+#
+sub incomplete {
+    my ($username, $domain, $map) = @_;
+
+
+    my $navmap = Apache::lonnavmaps::navmap->new($username, $domain);
+    
+
+    if (defined($navmap)) {
+	my $res = $navmap->getResourceByUrl($map);
+	my $result = $res->is_incomplete();
+	return $result;
+    } else {
+	return 1;
+    }
+}
+#
+#  When printing for students, the resoures and order of the
+#  resources may need to be altered if there are folders with
+#  random selectiopn or random ordering (or both) enabled.
+#  This sub computes the set of resources to print for a student
+#  modified both by random ordering and selection and filtered
+#  to only those that are in the original set selcted to be printed.
+#
+# Parameters:
+#   $helper - The helper we need $helper->{'VARS'}->{'symb'}
+#            to construct the navmap and the iteration.
+#   $seq   - The original set of resources to print 
+#            (really an array of resource names
+#   $who   - Student/domain for whome the sequence will be generated.
+#
+# Implicit inputs:
+#   $
+# Returns:
+#   reference to an array of resources that can be passed to
+#   print_resources.
+# 
+sub master_seq_to_person_seq {
+    my ($helper, $seq, $who) = @_;
+
+
+    my ($username, $userdomain, $usersection) = split(/:/, $who);
+
+    # Toss the sequence up into a hash so that we have O(1) lookup time.
+    # on the items that come out of the user's list of resources.
+    #
+    
+    my %seq_hash = map {$_  => 1} @$seq;
+    my @output_seq;
+    
+    my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
+    my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain);
+    my $iterator         = $navmap->getIterator($navmap->firstResource(),
+						$navmap->finishResource(),
+						{}, 1);
+    my %nonResourceItems = (
+	$iterator->BEGIN_MAP    => 1,
+	$iterator->BEGIN_BRANCH => 1,
+	$iterator->END_BRANCH   => 1,
+	$iterator->END_MAP      => 1,
+	$iterator->FORWARD      => 1,
+	$iterator->BACKWARD     => 1
+
+    );		# These items are not resources but appear in the midst of iteration.
+
+    #  Iterate on the resource..select the items that are randomly selected
+    #  and that are in the seq_has.  Presumably the iterator will take care
+    # of the random ordering part of the deal.
+    #
+    my $curres;
+    while ($curres = $iterator->next()) {
+	#
+	#  Only process resources..that re not removed by randomout...
+	#
+	if (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {
+	    my $symb = $curres->symb();
+	    if (exists $seq_hash{$symb}) {
+		push(@output_seq, $symb);
+	    }
+	}
+    }
+   				
+
+    return \@output_seq;		# for now.
+    
+}
+
 
 # Fetch the contents of a resource, uninterpreted.
 # This is used here to fetch a latex file to be included
@@ -427,7 +701,6 @@ sub ssi_with_retries {
 	$ssi_last_error_resource = $resource;
 	$ssi_last_error          = $response->code . " " . $response->message;
         $content='\section*{!!! An error occurred !!!}';	
-	&Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
     }
 
     return $content;
@@ -443,7 +716,6 @@ sub get_student_view_with_retries {
         $ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
         $ssi_last_error          = $response->code . " " . $response->message;
         $content='\section*{!!! An error occurred !!!}';
-        &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
     }
     return $content;
 
@@ -1555,7 +1827,9 @@ sub print_page_in_course {
 	my $title=&Apache::lonnet::gettitle($symb);
 	$title = &Apache::lonxml::latex_special_symbols($title);
     } else {
-	$result.=$currentURL;
+        my $esc_currentURL= $currentURL;
+        $esc_currentURL =~ s/_/\\_/g;
+	$result.=$esc_currentURL;
     }
     $result .= '\\\\';
 
@@ -1585,7 +1859,7 @@ sub print_page_in_course {
 	}
 	# these resources go through the XML transformer:
 
-	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/)  {		
+	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {		
 	    my $urlp = &Apache::lonnet::clutter($resource_src);
 	    my %form;
 	    my %moreenv;
@@ -1700,8 +1974,8 @@ sub print_page_in_course {
 # List of recently generated print files
 #
 sub recently_generated {
-    my $r=shift;
-    my $prtspool=$r->dir_config('lonPrtDir');
+    my ($prtspool) = @_;
+    my $output;
     my $zip_result;
     my $pdf_result;
     opendir(DIR,$prtspool);
@@ -1734,10 +2008,10 @@ sub recently_generated {
 	if ($ext eq 'zip') { $zip_result .= $result; }
     }
     if ($zip_result || $pdf_result) {
-        $r->print('<hr />');
+        $output ='<hr />';
     }
     if ($zip_result) {
-	$r->print('<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
+	$output .='<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
                   .&Apache::loncommon::start_data_table()
                   .&Apache::loncommon::start_data_table_header_row()
                   .'<th>'.&mt('Download').'</th>'
@@ -1745,11 +2019,10 @@ sub recently_generated {
                   .'<th>'.&mt('File Size (Bytes)').'</th>'
                   .&Apache::loncommon::end_data_table_header_row()
                   .$zip_result
-                  .&Apache::loncommon::end_data_table()
-        );
+                  .&Apache::loncommon::end_data_table();
     }
     if ($pdf_result) {
-	$r->print('<h3>'.&mt('Recently generated printouts')."</h3>\n"
+	$output .='<h3>'.&mt('Recently generated printouts')."</h3>\n"
                   .&Apache::loncommon::start_data_table()
                   .&Apache::loncommon::start_data_table_header_row()
                   .'<th>'.&mt('Download').'</th>'
@@ -1757,9 +2030,9 @@ sub recently_generated {
                   .'<th>'.&mt('File Size (Bytes)').'</th>'
                   .&Apache::loncommon::end_data_table_header_row()
                   .$pdf_result
-                  .&Apache::loncommon::end_data_table()
-        );
+                  .&Apache::loncommon::end_data_table();
     }
+    return $output;
 }
 
 #
@@ -1919,6 +2192,8 @@ sub set_form_extraspace {
 #
 sub print_construction_sequence {
     my ($currentURL, $helper, %form, $LaTeXwidth) = @_;
+
+
     my $result;
     my $rndseed=time;
     if ($helper->{'VARS'}->{'curseed'}) {
@@ -2020,12 +2295,44 @@ sub print_construction_sequence {
     return $result;
 }
 
+#
+#  Top level for generating print output.
+#
+#  May call print_resources if multiple resources will be printed.
+#
+#  The main driver is $selectionmade which reflects the type of print out
+#  requested:
+#   Value    Print type:
+#   1        Print resource that's being looked at.
+#   2        Print problems in a map or in a page.
+#   3        Print pages in a map or resources in a page.
+#   4        Print all problems  or all resources.
+#   5        Print problems for seleted students.
+#   6        Print selected problems from a folder.
+#   7        Print print selected resources from some scope.
+#   8        Print resources for selected students.
+#
+#BZ 5209
+#   2        map_incomplete_problems_seq Print incomplete problems from the current
+#            folder in student context.
+#   5      map_incomplete_problems_people_seq Print incomplete problems from the
+#            current folder in privileged context.
+#    5      incomplete_problems_selpeople_course Print incomplete problems for
+#            selected people from the entire course.
+#
+#   Item 101 has much the same processing as 8,
+#
+#  Differences:  Item 101, 102 require per-student filtering of the resource
+#  set so that only the incomplete resources are printed.
+#  For item 100, filtering was done at the helper level.
+
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
     $ssi_error = 0;		# This will be set nonzero by failing ssi's.
     $resources_printed = '';
     $font_size = $helper->{'VARS'}->{'fontsize'};
+    my $print_type = $helper->{'VARS'}->{'PRINT_TYPE'}; # Allows textual simplification.
     my $do_postprocessing = 1;
     my $js = <<ENDPART;
 <script type="text/javascript">
@@ -2075,7 +2382,7 @@ ENDPART
 
     $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
     &set_form_extraspace($helper);
-    $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'}; 
+    $env{'form.lastprinttype'} = $print_type; 
     &Apache::loncommon::store_course_settings('print',
 					      {'pagebreaks'    => 'scalar',
 					       'extraspace'    => 'scalar',
@@ -2125,8 +2432,7 @@ ENDPART
 	&Apache::lonnet::delenv('construct.style');
     }
 
-
-    if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
+    if ($print_type eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
 
@@ -2288,32 +2594,35 @@ ENDPART
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
 				  $helper->{'VARS'}->{'symb'});
 	}
-    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') or
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page') or
-             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
-             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
-	     ) { 
-
+    } elsif (($print_type eq 'map_problems')          or
+	     ($print_type eq 'map_problems_in_page')  or
+	     ($print_type eq 'map_resources_in_page') or
+             ($print_type eq 'map_problems_pages')    or
+             ($print_type eq 'all_problems')          or
+	     ($print_type eq 'all_resources')         or # BUGBUG
+	     ($print_type eq 'select_sequences')      or
+	     ($print_type eq 'map_incomplete_problems_seq')
+	     ) {
 
+ 
         #-- produce an output string
-	if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')  or
-	    ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {
+	if (($print_type eq 'map_problems')                or
+	    ($print_type eq 'map_incomplete_problems_seq') or
+	    ($print_type eq 'map_problems_in_page') ) {
 	    $selectionmade = 2;
-	} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
-		 ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page'))
+	} elsif (($print_type eq 'map_problems_pages') or
+		 ($print_type eq 'map_resources_in_page'))
 	{
 	    $selectionmade = 3;
-	} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') 
+	} elsif (($print_type eq 'all_problems') 
 		 ) {
 	    $selectionmade = 4;
-	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
+	} elsif ($print_type eq 'all_resources') {  #BUGBUG
 	    $selectionmade = 4;
-	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
+	} elsif ($print_type eq 'select_sequences') {
 	    $selectionmade = 7;
 	}
+
 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -2360,7 +2669,13 @@ ENDPART
 		&Apache::lonxml::remember_problem_counter();
 		if ($flag_latex_header_remove eq 'NO') {
 		    $texversion.=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  # RF
-		    $flag_latex_header_remove = 'YES';
+                    unless (($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') ||
+                            (($i==0) &&
+                             (($urlp=~/\.page$/) ||
+                              ($print_type eq 'map_problems_in_page') ||
+                              ($print_type eq 'map_resources_in_page')))) {
+                        $flag_latex_header_remove = 'YES';
+                    }
 		}
 		$texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($urlp=~/\.page$/) {
@@ -2368,7 +2683,7 @@ ENDPART
 		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
 		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
 		    $flag_page_in_sequence = 'YES';
-		} 
+		}
 
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
@@ -2380,13 +2695,22 @@ ENDPART
 
 		    &Apache::lonxml::restore_problem_counter();
 		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
-
+                    if ($urlp =~ /\.page$/) {
+                        $answer =~ s/\\end{document}(\d*)$//;
+                    }
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                        if ($urlp =~ /\.page$/) {
+                            my @probs = split(/\\keephidden{ENDOFPROBLEM}/,$texversion);
+                            my $lastprob = pop(@probs);
+                            $texversion = join('\keephidden{ENDOFPROBLEM}',@probs).
+                            $answer.'\keephidden{ENDOFPROBLEM}'.$lastprob;
+                        } else {
+                            $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                        }
 		    } else {
-			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $texversion =~ s/\\begin{document}//;
+#			    $texversion =~ s/\\begin{document}//; # FIXME
 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
 			    $title = &Apache::lonxml::latex_special_symbols($title);
 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
@@ -2452,7 +2776,11 @@ ENDPART
 		if ($i > 0) {
 		    $result .= '\cleardoublepage';
 		}
-		$result .= &include_pdf($urlp);
+                my $texfrompdf = &include_pdf($urlp);
+                if ($flag_latex_header_remove ne 'NO') {
+                    $texfrompdf = &latex_header_footer_remove($texfrompdf);
+                }
+                $result .= $texfrompdf;
 		if ($i != $#master_seq) {
 		    if ($numberofcolumns eq '1') {
 			$result .= '\newpage';
@@ -2475,7 +2803,7 @@ ENDPART
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    }	    
+	    }
 	    if (&Apache::loncommon::connection_aborted($r)) { 
 		last; 
 	    }
@@ -2485,20 +2813,24 @@ ENDPART
 	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
 	}	
 	$result .= '\end{document}';
-     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
+     } elsif (($print_type eq 'problems_for_students')           ||
+	      ($print_type eq 'problems_for_students_from_page') ||
+	      ($print_type eq 'all_problems_students')           ||
+	      ($print_type eq 'resources_for_students')          ||
+	      ($print_type eq 'incomplete_problems_selpeople_course') ||
+	      ($print_type eq 'map_incomplete_problems_people_seq')){
 
 
      #-- prints assignments for whole class or for selected students  
 	 my $type;
-	 if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {
+	 if (($print_type eq 'problems_for_students')           ||
+	     ($print_type eq 'problems_for_students_from_page') ||
+	     ($print_type eq 'all_problems_students')           ||
+	     ($print_type eq 'incomplete_problems_selpeople_course') ||
+	     ($print_type eq 'map_incomplete_problems_people_seq')) {
 	     $selectionmade=5;
 	     $type='problems';
-	 } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
+	 } elsif ($print_type eq 'resources_for_students') {
 	     $selectionmade=8;
 	     $type='resources';
 	 }
@@ -2552,7 +2884,6 @@ ENDPART
 	 my $i = 0;
 	 my $last_section = (split(/:/,$students[0]))[2];
 	 foreach my $person (@students) {
-
              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	     if (-e $duefile) {
 		 my $temp_file = Apache::File->new('>>'.$duefile);
@@ -2568,23 +2899,25 @@ ENDPART
 	     } else {
 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
 	     }
+	     my $actual_seq = master_seq_to_person_seq($helper, \@master_seq, $person);
 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
-						     \%moreenv,\@master_seq,
+						     \%moreenv,  $actual_seq,
 						     $flag_latex_header_remove,
 						     $LaTeXwidth);
 	     $resources_printed .= ":";
 	     $print_array[$i].=$output;
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
-	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
+#	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
+	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
 	     $flag_latex_header_remove = 'YES';
 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
 	 }
 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	 $result .= $print_array[0].'  \end{document}';
-     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) { 
+     } elsif (($print_type eq 'problems_for_anon')      ||
+	      ($print_type eq 'problems_for_anon_page') ||
+	      ($print_type eq 'resources_for_anon')  ) { 
 	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
 	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
@@ -2646,11 +2979,12 @@ ENDPART
 	     @allcodes=keys(%allcodes);
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+	 my ($type) = split(/_/,$print_type);
 	 &adjust_number_to_print($helper);
 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
-	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
-	     $number_per_page=$num_todo;
+	 if ($number_per_page eq '0' || $number_per_page eq 'all'
+	     || $number_per_page eq 'section') {
+	     $number_per_page=$num_todo > 0 ? $num_todo : 1;
 	 }
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
@@ -2676,7 +3010,7 @@ ENDPART
 	 }
 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	 $result .= $print_array[0].'  \end{document}';
-     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {      
+     } elsif ($print_type eq 'problems_from_directory') {      
     #prints selected problems from the subdirectory 
 	$selectionmade = 6;
         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
@@ -2758,7 +3092,13 @@ ENDPART
     # Only post process if that has not been turned off e.g. by a raw latex resource.
 
     if ($do_postprocessing) {
-	$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
+	$result = &page_format_transformation($papersize,
+					      $laystyle,$numberofcolumns,
+					      $print_type,$result,
+					      $helper->{VARS}->{'assignment'},
+					      $helper->{'VARS'}->{'TABLE_CONTENTS'},
+					      $helper->{'VARS'}->{'TABLE_INDEX'},
+					      $selectionmade);
 	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
 				     $helper->{'VARS'}->{'ANSWER_TYPE'});
 	#if ($numberofcolumns == 1) {
@@ -2915,14 +3255,26 @@ sub print_resources {
     my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);
     my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
+    #
+    # Figure out if we need to filter the output by
+    # the incomplete problems for that person
+    #
+    my $print_type = $helper->{'VARS'}->{'PRINT_TYPE'};
+    my $print_incomplete = 0;
+    if (($print_type eq 'map_incomplete_problems_people_seq')   ||
+	($print_type eq 'incomplete_problems_selpeople_course')) {
+	$print_incomplete = 1;
+    }
     if ($person =~ 'anon') {
 	$namepostfix .="Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+
     #  Fullname may have special latex characters that need \ prefixing:
     #
 
     my $i           = 0;
+    my $actually_printed = 0;	# Count of resources printed.
     #goes through all resources, checks if they are available for 
     #current student, and produces output   
 
@@ -2939,6 +3291,7 @@ sub print_resources {
     #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #
+
     my $syllabus_first = 0;
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
@@ -2948,10 +3301,13 @@ sub print_resources {
 	}
 	$current_output .= &get_extra_vspaces($helper, $curresline);
 	$i++;
-
 	if ( !($type eq 'problems' && 
-	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
+	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
+		next;
+	    }
+	    $actually_printed++; # we're going to print one.
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
 		if ($res_url!~m|^ext/|
 		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
@@ -2959,11 +3315,26 @@ sub print_resources {
 		    &Apache::lonxml::remember_problem_counter();    
 
 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+                    if ($res_url =~ /\.page$/) {
+                        if ($remove_latex_header eq 'NO') {
+                            if (!($rendered =~ /\\begin\{document\}/)) {
+                                $rendered = &print_latex_header().$rendered;
+                            }
+                        }
+;
+                        if ($remove_latex_header eq 'YES') {
+                            $rendered = &latex_header_footer_remove($rendered);
+                        } else {
+                            $rendered =~ s/\\end{document}\d*//;
+                        }
+                    }
 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 			#   Use a copy of the hash so we don't pervert it on future loop passes.
 			my %answerenv = %{$moreenv};
 			$answerenv{'answer_output_mode'}='tex';
+
+
 			$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 			
 			&Apache::lonxml::restore_problem_counter();
@@ -2976,7 +3347,9 @@ sub print_resources {
 
 			    
 			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $header =~ s/\\begin{document}//;     #<<<<<
+                            unless ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') {
+                                $header =~ s/\\begin{document}//;     #<<<<<
+                            }
 			    my $title = &Apache::lonnet::gettitle($curresline);
 			    $title = &Apache::lonxml::latex_special_symbols($title);
 			    my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
@@ -3033,11 +3406,27 @@ sub print_resources {
 		}
 	    }
 	    $remove_latex_header = 'YES';
-	} 
+	}
 	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
+    # If we are printing incomplete it's possible we don't have
+    # anything to print.  The print subsystem is not so good at handling
+    # that so we're going to generate a stub that says there are no
+    # incomplete resources for the person.
+    #
 
+    if ($actually_printed == 0) {
+	$current_output  = &encapsulate_minipage("\\vskip -10mm \nNo incomplete resources\n \\vskip 100 mm { }\n");
+	if ($remove_latex_header eq "NO") {
+	    $current_output = &print_latex_header() . $current_output;
+	} else {
+	    $current_output = &latex_header_footer_remove($current_output);
+	}
+    }
 
+    if ($syllabus_first) {
+        $current_output =~ s/\\\\ Last updated:/Last updated:/
+    }
     my $courseidinfo = &get_course();
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $header_line =
@@ -3046,11 +3435,8 @@ sub print_resources {
     my $header_start = ($columns_in_format == 1) ? '\lhead'
 	                                         : '\fancyhead[LO]';
     $header_line = $header_start.'{'.$header_line.'}';
-    if ($current_output=~/\\documentclass/ && (!$syllabus_first)) {
+    if ($current_output=~/\\documentclass/) {
 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
-    } elsif ($syllabus_first) {
-
-	$current_output =~ s/\\\\ Last updated:/Last updated:/
     } else {
 	my $blankpages = 
 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
@@ -3123,6 +3509,11 @@ sub init_perm {
 	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     }
+    $perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+    if (!$perm{'vgr'}) {
+        $perm{'vgr'}=&Apache::lonnet::allowed('vgr',
+                   $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    }
 }
 
 sub get_randomly_ordered_warning {
@@ -3270,6 +3661,8 @@ sub printHelper {
     my ($map, $id, $url);
     my $subdir;
     my $is_published=0;		# True when printing from resource space.
+    my $res_printable = 1;	# By default the current resource is printable.    
+    my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
 
     # Get the resource name from construction space
     if ($helper->{VARS}->{'construction'}) {
@@ -3284,7 +3677,12 @@ sub printHelper {
 	    ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
 	    $helper->{VARS}->{'postdata'} = 
 		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+	    my $navmap = Apache::lonnavmaps::navmap->new();
+	    my $res   = $navmap->getBySymb($symb);
+	    $res_printable  = $res->resprintable() || $userCanPrint; #printability in course context
 	} else {
+	    # Resource space.
+
 	    $url = $helper->{VARS}->{'postdata'};
 	    $is_published=1;	# From resource space.
 	}
@@ -3294,6 +3692,8 @@ sub printHelper {
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
         }
         $subdir = &Apache::lonnet::filelocation("", $url);
+
+
     }
     if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
 	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
@@ -3323,18 +3723,29 @@ sub printHelper {
     my $printChoices = [];
     my $paramHash;
 
-    if ($resourceTitle) {
+    # If there is a current resource and it is printable
+    # Give that as a choice.
+
+    if ($resourceTitle && $res_printable) {
         push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
     }
+    
 
     # Useful filter strings
-    my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
+
+    my $isPrintable = ' && $res->resprintable()';
+
+    my $isProblem = '(($res->is_problem()||$res->contains_problem() ||$res->is_practice()))';
+    $isProblem .= $isPrintable unless $userCanPrint;
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
-    my $isNotMap = '!$res->is_sequence()';
+    my $isProblemOrMap = '($res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
+    $isProblemOrMap .= $isPrintable unless $userCanPrint;
+    my $isNotMap = '(!$res->is_sequence())';
+    $isNotMap .= $isPrintable unless $userCanPrint;
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
-    my $symbFilter = '$res->shown_symb()';
+    $isMap .= $isPrintable unless $userCanPrint;
+    my $symbFilter = '$res->shown_symb() ';
     my $urlValue = '$res->link()';
 
     $helper->declareVar('SEQUENCE');
@@ -3414,6 +3825,34 @@ sub printHelper {
     if (($helper->{'VAR'}->{'construction'} ne '1' ) &&
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
+
+	# BZ 5209 - Print incomplete problems from sequence:
+	# the exact form of this depends on whether or not we are privileged or a mere
+	# plebe of s student:
+
+	my $printSelector = 'map_incomplete_problems_seq';
+	my $nextState     = 'CHOOSE_INCOMPLETE_SEQ';
+	my $textSuffix    = '';
+
+	if ($userCanPrint) {
+	    $printSelector = 'map_incomplete_problems_people_seq';
+	    $nextState     = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';
+	    $textSuffix    = ' for selected students';
+	    my $helperStates =
+		&create_incomplete_folder_selstud_helper($helper, $map); 
+	    &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+	} else {
+	    my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
+	    &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+	}
+
+	push(@{$printChoices},
+	     [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
+		  '<b>', '</b>',
+		  '<b><i>'. $sequenceTitle . '</b></i>'),
+	      $printSelector,
+	      $nextState]);
+
         # Allow problems from sequence
         push @{$printChoices}, 
 	    [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
@@ -3448,9 +3887,21 @@ sub printHelper {
     # If the user has pfo (print for others) allow them to print all 
     # problems and resources  in the entire course, optionally for selected students
     my $post_data = $helper->{VARS}->{'postdata'};
+    
     if ($perm{'pfo'} &&  !$is_published  &&
         ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
+	# BZ 5209 - incomplete problems from entire course:
+
+	push(@{$printChoices},
+	     [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
+	      'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
+	my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
+
+	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+
+	#  Selected problems/resources from entire course:
+
         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
 	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
 	push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
@@ -3516,7 +3967,7 @@ ALL_PROBLEMS
 	}
 
 	my $randomly_ordered_warning = 
-	    &get_randomly_ordered_warning($helper,$map);
+            &get_randomly_ordered_warning($helper, $map);
 
 	# resource_selector will hold a few states that:
 	#   - Allow resources to be selected for printing.
@@ -3535,27 +3986,15 @@ ALL_PROBLEMS
 							  $map,
 							  $isProblem, '', $symbFilter,
 							  $start_new_option);
-	$resource_selector .=  <<RESOURCE_SELECTOR;
-    <state name="PRINT_FORMATTING" title="How should results be printed?">
-    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
-    <choices variable="EMPTY_PAGES">
-      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
-      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
-      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
-      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-    </choices>
-    <nextstate>PAGESIZE</nextstate>
-    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
-    <choices variable="SPLIT_PDFS">
-       <choice computer="all">All assignments in a single PDF file</choice>
-       <choice computer="sections">Each PDF contains exactly one section</choice>
-       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
-            Specify the number of assignments per PDF:</choice>
-    </choices>
-    </state>
-RESOURCE_SELECTOR
-        $resource_selector .= &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
+        my $secpdfoption;
+        unless (($helper->{'VARS'} eq 'problems_for_anon')     ||
+                ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
+                ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
+            $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</choice>';
+        }
+	$resource_selector .=  &generate_format_selector($helper,
+                                                         'How should results be printed?').
+                               &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
 							'Select Problem(s) to print',
 							"multichoice='1' addstatus='1' closeallpages ='1'",
 							'RESOURCES',
@@ -3665,6 +4104,9 @@ RESOURCE_SELECTOR
 
 
 	if ($helper->{VARS}->{'assignment'}) {
+
+	    # Assignment printing:
+
 	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
 	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
@@ -3683,28 +4125,12 @@ RESOURCE_SELECTOR
       $start_new_option
       </resource>
     </state>
-
-    <state name="PRINT_FORMATTING" title="Format of the print job">
-    <nextstate>NUMBER_PER_PDF</nextstate>
-    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
-    <choices variable="EMPTY_PAGES">
-      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
-      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
-      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
-      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-    </choices>
-    <nextstate>PAGESIZE</nextstate>
-    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
-    <choices variable="SPLIT_PDFS">
-       <choice computer="all">All assignments in a single PDF file</choice>
-       <choice computer="sections">Each PDF contains exactly one section</choice>
-       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
-           Specify the number of assignments per PDF:</choice>
-    </choices>
-    </state>
 RESOURCE_SELECTOR
 
+        my $nextstate = '<nextstate>NUMBER_PER_PDF</nextstate>'; 
+        $resource_selector .= &generate_format_selector($helper,
+                                                        'Format of the print job',
+                                                        $nextstate);
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
     <choices variable='student_sort'>
@@ -3725,7 +4151,7 @@ CHOOSE_STUDENTS1
     <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
@@ -3733,6 +4159,10 @@ CHOOSE_STUDENTS1
 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -3757,7 +4187,7 @@ CHOOSE_STUDENTS1
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
 	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
-	      return 'Specifying a code name is incompatible with what you have specified above';
+	      return 'Specifying a code name is incompatible specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }
@@ -3858,7 +4288,7 @@ CHOOSE_FROM_ANY_SEQUENCE
     my $startedTable = 0; # have we started an HTML table yet? (need
                           # to close it later)
 
-    if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
+    if (($perm{'pav'} and $perm{'vgr'}) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
 	&addMessage('<br />'
                    .'<h3>'.&mt('Print Options').'</h3>'
@@ -4105,10 +4535,12 @@ PROBTYPE
         return $helper;
     }    
 
-    $r->print($helper->display());
+    my $footer;
     if ($helper->{STATE} eq 'START') {
-	&recently_generated($r);
+        my $prtspool=$r->dir_config('lonPrtDir'); 
+	$footer = &recently_generated($prtspool);
     }
+    $r->print($helper->display($footer));
     &Apache::lonhelper::unregisterHelperTags();
 
     return OK;