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

raeburn lon-capa-cvs-allow@mail.lon-capa.org
Sun, 23 Mar 2008 23:48:45 -0000


raeburn		Sun Mar 23 19:48:45 2008 EDT

  Modified files:              (Branch: version_2_6_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - backport 1.521
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.519 loncom/interface/lonprintout.pm:1.519.2.1
--- loncom/interface/lonprintout.pm:1.519	Tue Mar 11 05:52:56 2008
+++ loncom/interface/lonprintout.pm	Sun Mar 23 19:48:45 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.519 2008/03/11 09:52:56 foxr Exp $
+# $Id: lonprintout.pm,v 1.519.2.1 2008/03/23 23:48:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@
 use Apache::File();
 use Apache::lonnavmaps;
 use Apache::admannotations;
+use Apache::lonenc;
 use HTTP::Response;
 
 use LONCAPA::map();
@@ -1665,6 +1666,8 @@
 	my $pbreakresources = keys %page_breaks;
 	for (my $i=0;$i<=$#master_seq;$i++) {
 
+            &Apache::lonenc::reset_enc();
+
 	    # Note due to document structure, not allowed to put \newpage
 	    # prior to the first resource
 
@@ -1673,11 +1676,12 @@
 		    $result.="\\newpage\n";
 		}
 	    }
-	    my ($sequence,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+            my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    $urlp=&Apache::lonnet::clutter($urlp);
 	    $form{'symb'}=$master_seq[$i];
 
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
+
 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
 	    if ($i==0) {$prevassignment=$assignment;}
 	    my $texversion='';
@@ -1984,6 +1988,9 @@
 	    $rndseed=$helper->{'VARS'}->{'curseed'};
 	}
 	for (my $i=0;$i<=$#list_of_files;$i++) {
+
+            &Apache::lonenc::reset_enc();
+
 	    my $urlp = $list_of_files[$i];
 	    $urlp=~s|//|/|;
 	    if ($urlp=~/\//) {