--- loncom/interface/lonprintout.pm	2011/11/05 21:49:25	1.602
+++ 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.602 2011/11/05 21:49:25 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;
@@ -2271,17 +2272,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 +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 = '';
@@ -2555,11 +2545,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}';  
@@ -3049,11 +3034,7 @@ ENDPART
 	    if ($urlp=~/\//) {
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'rndseed'}=$rndseed;
-		if ($urlp =~ m|/home/([^/]+)/public_html|) {
-		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
-		} else {
-		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
-		}
+		$urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
 		$resources_printed .= $urlp.':';
 		my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
@@ -3074,19 +3055,16 @@ ENDPART
 			    $texversion.='\vskip 0 mm \noindent ';
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			} else {
-			    $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-			    my $URLpath=$urlp;
-			    $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
-			    $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+			    $texversion.='\vskip 0 mm \noindent\textbf{'.
+                                         &mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
+			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			}
 			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		    }
 		}
                 #this chunk is responsible for printing the path to problem
 
-		my $newurlp=$urlp;
-		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
-		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
+		my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
@@ -3135,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: