--- loncom/interface/lonprintout.pm	2004/03/23 19:36:51	1.286
+++ loncom/interface/lonprintout.pm	2004/03/24 22:22:04	1.287
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.286 2004/03/23 19:36:51 albertel Exp $
+# $Id: lonprintout.pm,v 1.287 2004/03/24 22:22:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1415,10 +1415,10 @@ sub printHelper {
 #    $r->print($helper->{VARS}->{'postdata'});
 
     # Useful filter strings
-    my $isProblem = '$res->is_problem()';
+    my $isProblem = '($res->is_problem()||$res->contains_problem) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
-    my $isNotMap = '!$res->is_map()';
+    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
+    my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
     my $symbFilter = '$res->symb()';
@@ -1442,7 +1442,8 @@ sub printHelper {
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
+    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+              closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
@@ -1452,7 +1453,8 @@ sub printHelper {
 
   <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
     <message>(mark them then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
+    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+              closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
@@ -1471,11 +1473,11 @@ HELPERFRAGMENT
          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1"
-	suppressEmptySequences='1' addstatus="1">
+    <resource variable="RESOURCES" toponly='0' multichoice="1"
+	suppressEmptySequences='0' addstatus="1" closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap;</filterfunc>
-      <choicefunc>return $isProblem;</choicefunc>
+      <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>
     </resource>
   </state>
@@ -1487,7 +1489,8 @@ ALL_PROBLEMS
 	}
 	my $resource_selector=<<RESOURCE_SELECTOR;
    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
-    <resource variable="RESOURCES" multichoice="1" addstatus="1">
+    <resource variable="RESOURCES" multichoice="1" addstatus="1" 
+              closeallpages="1">
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
@@ -1511,8 +1514,9 @@ RESOURCE_SELECTOR
 CHOOSE_STUDENTS
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
   <state name="CHOOSE_ANON1" title="Select Students and Resources">
-    <message><hr width='33%' /><b>How many Anonymous exams to print?</b></message>
+    <message><hr width='33%' /><b>Number of anonymous assignments to print?</b></message>
     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
+    
     <message><hr width='33%' /></message>
     $resource_selector
   </state>
@@ -1527,7 +1531,8 @@ CHOOSE_ANON1
 
 	$resource_selector=<<RESOURCE_SELECTOR;
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
-    <resource variable="RESOURCES" multichoice="1" addstatus="1">
+    <resource variable="RESOURCES" multichoice="1" addstatus="1" 
+              closeallpages="1">
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
@@ -1605,7 +1610,8 @@ CHOOSE_FROM_SUBDIR
     </state>
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
+    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+              closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>