--- loncom/interface/lonprintout.pm	2011/09/15 12:09:44	1.597
+++ loncom/interface/lonprintout.pm	2011/10/21 10:13:57	1.600
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.597 2011/09/15 12:09:44 raeburn Exp $
+# $Id: lonprintout.pm,v 1.600 2011/10/21 10:13:57 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,7 +123,7 @@ sub create_incomplete_folder_selstud_hel
 
     my $format_chooser = &generate_format_selector($helper,
 						'Format of the print job',
-						'','CHOOSE_STUDENTS_INCOMPLETE_FORMAT'); # end state.
+						'CHOOSE_STUDENTS_INCOMPLETE_FORMAT'); # end state.
 
     return $resource_chooser . $student_chooser . $format_chooser;
 }  
@@ -172,7 +172,6 @@ sub create_incomplete_course_helper {
 
     my $format = &generate_format_selector($helper,
 					   'Format of the print job',
-					   '',
 					   'INCOMPLETE_PROBLEMS_COURSE_FORMAT'); # end state.
 
     return $resource_chooser . $people_chooser . $format;
@@ -356,7 +355,7 @@ sub generate_code_selector {
     <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><b>Bubblesheet type:</b></message>
     <message></td><td></message>
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
     $bubble_types
@@ -395,21 +394,25 @@ CHOOSE_ANON1
    return $result;
 }
 
+#  Returns the XML for choosing how assignments are to be formatted 
+#  that text must still be parsed by the helper xml parser.
+# Parameters: 3 (required)
+
+#   helper       - The helper; $helper->{'VARS'}->{'PRINT_TYPE'} used
+#                  to check if splitting PDFs by section can be offered.
+#   title        - Title for the current state. 
+#   this_state   - State name of the chooser.
+
 sub generate_format_selector {
-    my ($helper,$title,$nextstate, $thisstate) = @_;
+    my ($helper,$title,$this_state) = @_;
     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
+    <state name="$this_state" title="$title">
     <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>
@@ -468,7 +471,7 @@ sub incomplete {
 #   $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
+#            (really an array of resource names (array of symb's).
 #   $who   - Student/domain for whome the sequence will be generated.
 #
 # Implicit inputs:
@@ -483,6 +486,7 @@ sub master_seq_to_person_seq {
 
     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.
     #
@@ -512,7 +516,8 @@ sub master_seq_to_person_seq {
     my $curres;
     while ($curres = $iterator->next()) {
 	#
-	#  Only process resources..that re not removed by randomout...
+	#  Only process resources..that are not removed by randomout...
+	#  and are selected for printint as well.
 	#
 	if (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {
 	    my $symb = $curres->symb();
@@ -2044,7 +2049,7 @@ sub recently_generated {
 #    A reference to a page break hash.
 #
 #
-# use Data::Dumper;
+use Data::Dumper;
 # sub dump_helper_vars {
 #    my ($helper) = @_;
 #    my $helpervars = Dumper($helper->{'VARS'});
@@ -3262,6 +3267,7 @@ 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
@@ -3994,7 +4000,8 @@ ALL_PROBLEMS
 							  $isProblem, '', $symbFilter,
 							  $start_new_option);
 	$resource_selector .=  &generate_format_selector($helper,
-                                                         'How should results be printed?').
+                                                         'How should results be printed?',
+                                                         'PRINT_FORMATTING').
                                &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
 							'Select Problem(s) to print',
 							"multichoice='1' addstatus='1' closeallpages ='1'",
@@ -4128,10 +4135,9 @@ ALL_PROBLEMS
     </state>
 RESOURCE_SELECTOR
 
-        my $nextstate = '<nextstate>NUMBER_PER_PDF</nextstate>'; 
         $resource_selector .= &generate_format_selector($helper,
                                                         'Format of the print job',
-                                                        $nextstate);
+                                                        'PRINT_FORMATTING');
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
     <choices variable='student_sort'>
@@ -4172,7 +4178,7 @@ CHOOSE_STUDENTS1
     <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><b>Bubblesheet type:</b></message>
     <message></td><td></message>
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
     $codechoice