--- loncom/interface/lonprintout.pm	2011/11/07 13:41:43	1.604
+++ loncom/interface/lonprintout.pm	2011/11/07 18:24:42	1.608
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.604 2011/11/07 13:41:43 www Exp $
+# $Id: lonprintout.pm,v 1.608 2011/11/07 18:24:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -634,9 +634,10 @@ sub include_pdf {
     # (unlikely).  If it did exist, add the pdf to the set of files/images that
     # need tob e converted for this print job:
 
-    $file =~ s|(.*)/res/|/home/httpd/html/res/|;
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+    $file =~ s{(.*)/res/}{$londocroot/res/};
 
-    open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+    open(FILE,">>$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
     print FILE ("$file\n");
     close (FILE);
 
@@ -2200,18 +2201,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;
@@ -2271,17 +2273,7 @@ sub print_construction_sequence {
 	    # IF sequence, recurse:
 	    
 	    if ($urlp =~ /\.sequence$/) {
-#
-# FIXME: this does not work for co-authors
-		my $sequence_url = $urlp;
-		my $domain       = $env{'user.domain'};	# Constr. space only on local
-		my $user         = $env{'user.name'};
-# FIXME: the substitutions below do not seem to make sense
-
-		$sequence_url    =~ s/^\/res\/$domain/\/home/;
-		$sequence_url    =~ s/^(\/home\/$user)/$1\/public_html/;
-#		$sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
-		$result .= &print_construction_sequence($sequence_url, 
+		$result .= &print_construction_sequence($urlp, 
 							$helper, %form, 
 							$LaTeXwidth);
 	    }
@@ -2338,7 +2330,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 = '';
@@ -2555,11 +2546,6 @@ ENDPART
 	    }
         } elsif ($cleanURL!~m|^/adm/|
 		 && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
-            #printing content of sequence from the construction space	
-
-# FIXME: unclear how this would work
-
-	    $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
 	    $result .= &print_construction_sequence($currentURL, $helper, %form,
 						    $LaTeXwidth);
 	    $result .= '\end{document}';  
@@ -3128,12 +3114,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: