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

[sakharuk]

sakharuk		Mon Oct 27 14:01:31 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Bug 2323 is fixed (problem numbering when printing exam with answers) for the resources from sequence only. I did not fixed for selected students printout because I want to know Guy's opinion first.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.258 loncom/interface/lonprintout.pm:1.259
--- loncom/interface/lonprintout.pm:1.258	Fri Oct 24 09:33:08 2003
+++ loncom/interface/lonprintout.pm	Mon Oct 27 14:01:31 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.258 2003/10/24 13:33:08 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.259 2003/10/27 19:01:31 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -847,7 +847,6 @@
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	my $prevassignment='';
-	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonxml::init_counter();
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
@@ -866,7 +865,8 @@
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
 	    if ($i==0) {$prevassignment=$assignment;}
 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
-	    my $texversion=&Apache::lonnet::ssi($urlp,%form);
+	    $form{'freeze_counter'}='no';
+	    my $texversion.=&Apache::lonnet::ssi($urlp,%form);
 	    if ($urlp=~/\.page$/) {
 		($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
 		if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
@@ -878,6 +878,7 @@
 		my %form;
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
+		$form{'freeze_counter'}='yes';
 		my $answer=&Apache::lonnet::ssi($urlp,%form);
 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;