--- loncom/interface/lonprintout.pm	2006/03/29 11:47:03	1.434
+++ loncom/interface/lonprintout.pm	2006/04/18 10:03:45	1.437
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.434 2006/03/29 11:47:03 foxr Exp $
+# $Id: lonprintout.pm,v 1.437 2006/04/18 10:03:45 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1119,6 +1119,8 @@ ENDPART
 	$selectionmade = 1;
 	if ($cleanURL!~m|^/adm/|
 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	    if ($cleanURL =~/\.page/) {
+	    }
 	    my $rndseed=time;
 	    my $texversion='';
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
@@ -1319,6 +1321,8 @@ ENDPART
 	    my $texversion='';
 	    if ($urlp!~m|^/adm/|
 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		if ($urlp =!/\.page/) {
+		}
 		$resources_printed .= $urlp.':';
 
 		&Apache::lonxml::remember_problem_counter();
@@ -1824,6 +1828,8 @@ sub print_resources {
 	    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)$/) {
+		    if ($res_url =~ /\.page/) {
+		    }
 		    $printed .= $curresline.':';
 
 		    &Apache::lonxml::remember_problem_counter();    
@@ -2150,11 +2156,10 @@ 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='0' addstatus="1"
+    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblemOrMap;</filterfunc>
-      <choicefunc>return $isNotMap;</choicefunc>
+      <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       <option text='Newpage' variable='FINISHPAGE' />
@@ -2163,10 +2168,10 @@ 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='0' addstatus="1"
+    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <choicefunc>return $isNotMap;</choicefunc>
+      <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       <option text='Newpage' variable='FINISHPAGE' />
@@ -2235,7 +2240,6 @@ ALL_PROBLEMS
       </resource>
     </state>
     <state name="PRINT_FORMATTING" title="How should results be printed?">
-    <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>
@@ -2243,17 +2247,15 @@ ALL_PROBLEMS
       <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>
-    </state>
-    <state name="NUMBER_PER_PDF" title="Number printed at once">
     <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">Specify Number:</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT" relateddefault="all">
+            Specify Number:</choice>
     </choices>
-    <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
     </state>
 RESOURCE_SELECTOR
 
@@ -2264,6 +2266,7 @@ RESOURCE_SELECTOR
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+      <message><br /><hr /><br /> </message>
       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
   </state>
     $resource_selector
@@ -2297,12 +2300,13 @@ CHOOSE_STUDENTS
 	    }
 	    push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
 	}
-	$code_selection .=
-'   
-      <exec>
-        push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
-      </exec>
-    '.$/;
+	if (%codes_to_print) {
+	    $code_selection .='   
+             <exec>
+               push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+            </exec>
+            '.$/;
+	}
 
 	
 	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
@@ -2404,17 +2408,15 @@ CHOOSE_ANON1
       <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>
-    </state>
-    <state name="NUMBER_PER_PDF" title="Number assignments per pdf">
     <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">Specify Number:</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT" relateddefault="all">
+           Specify Number:</choice>
     </choices>
-    <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
     </state>
 RESOURCE_SELECTOR
 
@@ -2424,6 +2426,7 @@ RESOURCE_SELECTOR
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+    <message><br /><hr /><br /></message>
     <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
 
     </state>
@@ -2536,11 +2539,10 @@ 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='0' addstatus="1"
+    <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblemOrMap;</filterfunc>
-      <choicefunc>return $isProblem;</choicefunc>
+      <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       <option text='Newpage' variable='FINISHPAGE' />