--- loncom/interface/lonprintout.pm	2011/03/11 05:01:36	1.586
+++ loncom/interface/lonprintout.pm	2011/05/18 11:26:44	1.588
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.586 2011/03/11 05:01:36 raeburn Exp $
+# $Id: lonprintout.pm,v 1.588 2011/05/18 11:26:44 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,7 @@ use Apache::lonlocal;
 use Carp;
 use LONCAPA;
 
+
 my %perm;
 my %parmhash;
 my $resources_printed;
@@ -2705,8 +2706,9 @@ ENDPART
 	 my ($type) = split(/_/,$helper->{'VARS'}->{'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');
@@ -3402,13 +3404,13 @@ sub printHelper {
     }
 
     # Useful filter strings
-    my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
+    my $isProblem = '(($res->is_problem()||$res->contains_problem||$res->is_practice())) && $res->resprintable() ';
     $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()) && $res->resprintable()';
+    my $isNotMap = '(!$res->is_sequence()) && $res->resprintable()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isMap = '$res->is_map()';
-    my $symbFilter = '$res->shown_symb()';
+    my $isMap = '$res->is_map() && $res->resprintable()';
+    my $symbFilter = '$res->shown_symb() && $res->resprintable()';
     my $urlValue = '$res->link()';
 
     $helper->declareVar('SEQUENCE');