--- loncom/interface/lonprintout.pm	2003/04/22 19:54:39	1.131
+++ loncom/interface/lonprintout.pm	2003/05/01 17:19:25	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.131 2003/04/22 19:54:39 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.139 2003/05/01 17:19:25 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1378,6 +1378,7 @@ sub printHelper {
         my $isProblem = '$res->is_problem();';
         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
         my $isNotMap = '!$res->is_map();';
+        my $symb = '$res->symb();';
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problems">
     <message>Select problems to print:</message>
@@ -1386,6 +1387,7 @@ sub printHelper {
       <filterfunc>return $isProblemOrMap</filterfunc>
       <choicefunc>return $isProblem</choicefunc>
       <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
       </resource>
     </state>
 
@@ -1395,6 +1397,7 @@ sub printHelper {
       <nextstate>FINAL</nextstate>
       <choicefunc>return $isNotMap;</choicefunc>
       <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
       </resource>
     </state>
 HELPERFRAGMENT
@@ -1405,10 +1408,23 @@ HELPERFRAGMENT
     # If the user is priviledged, allow them to print all 
     # problems in the course, optionally for selected students
     if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
-        push @{$printChoices}, ['<b>All problems</b> in course (may take a lot of time)', 'all_problems', 'FINAL'];
+        push @{$printChoices}, ['<b>All problems</b> in course (may take a lot of time)', 'all_problems', 'ALL_PROBLEMS'];
         push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
 
+        my $isProblem = '$res->is_problem();';
+        my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
+        my $symb = '$res->symb();';
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
+  <state name="ALL_PROBLEMS" title="Select Problems">
+    <message>Select problems to print:</message>
+    <resource variable="RESOURCES" multichoice="1">
+      <nextstate>FINAL</nextstate>
+      <filterfunc>return $isProblemOrMap</filterfunc>
+      <choicefunc>return $isProblem</choicefunc>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    </state>
+
   <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="FINAL" />
@@ -1421,17 +1437,22 @@ CHOOSE_STUDENTS
         push @{$printChoices}, ["Problems from <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         
         my $f = '$filename';
-        &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_SUBDIR);
+        my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
   <state name="CHOOSE_FROM_SUBDIR" title="Select Files">
     <message>Select problems you wish to print from <b>$subdir</b></message>
-    <files variable="FILES">
+    <files variable="FILES" multichoice='1'>
       <nextstate>FINAL</nextstate>
-      <filechoice>$subdir</filechoice>
-      <filefilter>return $f =~ 
+      <filechoice>return '$subdir';</filechoice>
+CHOOSE_FROM_SUBDIR
+        
+        $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
+      <filefilter>return $filename =~ 
            m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
       </filefilter>
+      </files>
     </state>
 CHOOSE_FROM_SUBDIR
+        &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
     }
 
     # Generate the first state, to select which resources get printed.
@@ -1441,6 +1462,7 @@ CHOOSE_FROM_SUBDIR
     Apache::lonhelper::message->new();
     $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = 'PRINT_TYPE';
+    $helper->declareVar('PRINT_TYPE');
     $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();
     Apache::lonprintout::page_format_state->new("FORMAT");
@@ -1508,7 +1530,11 @@ my @paperSize = ("Letter [8 1/2x11 in]",
 sub new { 
     my $self = Apache::lonhelper::element->new();
 
+    shift;
+
     $self->{'variable'} = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    $helper->declareVar($self->{'variable'});
     bless($self);
     return $self;
 }
@@ -1566,6 +1592,17 @@ STATEHTML
     return $result;
 }
 
+sub postprocess {
+    my $self = shift;
+
+    my $var = $self->{'variable'};
+    my $helper = Apache::lonhelper->getHelper();
+    $helper->{VARS}->{$var} = 
+        $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
+        $ENV{"form.$var.paper"};
+    return 1;
+}
+
 1;
 
 __END__