--- loncom/interface/lonprintout.pm 2011/11/07 14:36:49 1.605 +++ loncom/interface/lonprintout.pm 2011/11/07 16:09:09 1.607 @@ -2,7 +2,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.605 2011/11/07 14:36:49 www Exp $ +# $Id: lonprintout.pm,v 1.607 2011/11/07 16:09:09 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2200,18 +2200,19 @@ sub set_form_extraspace { sub print_construction_sequence { my ($currentURL, $helper, %form, $LaTeXwidth) = @_; - my $result; my $rndseed=time; if ($helper->{'VARS'}->{'curseed'}) { $rndseed=$helper->{'VARS'}->{'curseed'}; } - my $errtext=&LONCAPA::map::mapread($currentURL); + my $errtext=&LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$currentURL)); + # # These make this all support recursing for subsequences. # my @order = @LONCAPA::map::order; my @resources = @LONCAPA::map::resources; + for (my $member=0;$member<=$#order;$member++) { $resources[$order[$member]]=~/^([^:]*):([^:]*):/; my $urlp=$2; @@ -2328,7 +2329,6 @@ sub print_construction_sequence { sub output_data { my ($r,$helper,$rparmhash) = @_; - my %parmhash = %$rparmhash; $ssi_error = 0; # This will be set nonzero by failing ssi's. $resources_printed = ''; @@ -3113,12 +3113,7 @@ ENDPART my $URLback=''; #link to original document if ($helper->{'VARS'}->{'construction'} eq '1') { - #prints resource from the construction space - $URLback='/'.$helper->{'VARS'}->{'filename'}; - if ($URLback=~/([^?]+)/) { - $URLback=$1; - $URLback=~s|^/~|/priv/|; - } + $URLback=$helper->{'VARS'}->{'filename'}; } # # Final adjustment of the font size: