--- loncom/interface/lonprintout.pm	2003/05/02 19:18:39	1.144
+++ loncom/interface/lonprintout.pm	2003/05/05 18:01:21	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.144 2003/05/02 19:18:39 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.149 2003/05/05 18:01:21 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1774,22 +1774,30 @@ sub printHelper {
     Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     
     my $helper = Apache::lonhelper::helper->new("Printing Wizard");
+    $helper->declareVar('symb');
+    $helper->declareVar('postdata');
     
     # This will persistently load in the data we want from the
     # very first screen.
-    if (defined($ENV{'form.postdata'})) {
-        $helper->{VARS}->{'postdata'} = $ENV{'form.postdata'};
+    if ($ENV{'form.postdata'}) {
+        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
     }
-    if (defined($ENV{'form.symb'})) {
-        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+    if ($ENV{'form.symb'}) {
+        $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
     }
-    if (defined($ENV{'form.url'})) {
-        $helper->{VARS}->{'url'} = $helper->{VARS}->{'postdata'};
+    if ($ENV{'form.url'}) {
+        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
     }
 
+    
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
     $helper->{VARS}->{'assignment'} = $sequenceTitle;
 
+    # Extract map
+    my $symb = $helper->{VARS}->{'symb'};
+    my ($map, $id, $url) = split(/___/, $symb);
+    $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+
     if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
         my $url = $helper->{VARS}->{'postdata'};
         $resourceTitle = substr($url, rindex($url, '/') + 1);
@@ -1797,11 +1805,7 @@ sub printHelper {
 
     Apache::lonhelper::registerHelperTags();
 
-    # Extract map
-    my $symb = $helper->{VARS}->{'symb'};
-    my ($map, $id, $url) = split(/__/, $symb);
-
-    my $subdir = &Apache::lonnet::filelocation("", $helper->{VARS}->{'postdata'});
+    my $subdir = &Apache::lonnet::filelocation("", $url);
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
@@ -1839,8 +1843,7 @@ sub printHelper {
     <message>Select problems to print:</message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblemOrMap</filterfunc>
-      <choicefunc>return $isProblem</choicefunc>
+      <filterfunc>return $isProblem</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symb</valuefunc>
       </resource>
@@ -1850,7 +1853,7 @@ sub printHelper {
     <message>Select resources to print:</message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>
-      <choicefunc>return $isNotMap;</choicefunc>
+      <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symb</valuefunc>
       </resource>
@@ -1883,6 +1886,18 @@ HELPERFRAGMENT
   <state name="CHOOSE_STUDENTS" title="Choose Students">
     <message>Select the students you wish to print the problems for:</message>
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+    <resource variable="RESOURCES" multichoice="1">
+      <filterfunc>return $isProblem</filterfunc>
+      <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    <message>How should the results be printed?</message>
+    <choices variable="EMPTY_PAGES">
+      <choice computer='0'>Print all problems with no blank space between them</choice>
+      <choice computer='1'>Put each student's problems on a new page (add pagefeed after each student)</choice> <!-- ' -->
+      <choice computer='2'>Seperate each student's problems with a full blank page</choice> <!-- ' -->
+      <choice computer='3'>Seperate each student's problems with two full blank pages</choice> <!-- ' -->
+      </choices>
     </state>
 CHOOSE_STUDENTS
     }