[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

[foxr]

foxr		Mon Jan 24 07:17:55 2005 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Defect 3552:
     All calls to print_resources did not pass in the problem_stream switch in
  the additional environment parameter.  Fixed. 
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.352 loncom/interface/lonprintout.pm:1.353
--- loncom/interface/lonprintout.pm:1.352	Mon Jan 10 07:15:23 2005
+++ loncom/interface/lonprintout.pm	Mon Jan 24 07:17:55 2005
@@ -1,7 +1,7 @@
 #  The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.352 2005/01/10 12:15:23 foxr Exp $
+# $Id: lonprintout.pm,v 1.353 2005/01/24 12:17:55 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -886,6 +886,7 @@
 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 		my %form;
+		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
 		$form{'rndseed'}=$rndseed;
@@ -948,6 +949,7 @@
 			$form{'grade_target'}='answer';
 			$form{'answer_output_mode'}='tex';
 			$form{'rndseed'}=$rndseed;
+			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
                         if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
 			my $answer=&Apache::lonnet::ssi($urlp,%form);
 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
@@ -1123,6 +1125,8 @@
 	$result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
+
+
      #-- prints assignments for whole class or for selected students  
 	 my $type;
 	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
@@ -1155,6 +1159,7 @@
          $moreenv{'instructor_comments'}='hide';
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
 	 my $student_counter=-1;
@@ -1167,7 +1172,10 @@
 	     }
 	     $student_counter++;
 	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
-	     my ($output,$fullname)=&print_resources($r,$helper,$person,$type,\%moreenv,\@master_seq,$flag_latex_header_remove);
+	     my ($output,$fullname)=&print_resources($r,$helper,
+						     $person,$type,
+						     \%moreenv,\@master_seq,
+						     $flag_latex_header_remove);
 	     $print_array[$i].=$output;
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
@@ -1184,6 +1192,7 @@
 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
+	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
 	 my $seed=time+($$<<16)+($$);
 	 my @allcodes;
 	 if ($old_name) {
@@ -1242,6 +1251,7 @@
 	    $urlp=~s|//|/|;
 	    if ($urlp=~/\//) {
 		my %form;
+		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'grade_target'}='tex';
 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'rndseed'}=$rndseed;
@@ -1546,13 +1556,12 @@
 #	return OK;
 
     my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
-    
+ 
 #	my $key; 
 #	foreach $key (keys %parmhash) {
 #	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
 #	}
-#	return OK;
-
+#