--- loncom/interface/lonprintout.pm	2011/10/26 02:09:42	1.601
+++ loncom/interface/lonprintout.pm	2011/11/07 20:05:56	1.609
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.601 2011/10/26 02:09:42 www Exp $
+# $Id: lonprintout.pm,v 1.609 2011/11/07 20:05:56 www 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);
 
@@ -1808,6 +1809,7 @@ sub map_laystyle {
 
 sub print_page_in_course {
     my ($helper, $rparmhash, $currentURL, $resources) = @_;
+
     my %parmhash       = %$rparmhash;
     my @page_resources = @$resources;
     my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
@@ -1864,8 +1866,10 @@ sub print_page_in_course {
 	}
 	# these resources go through the XML transformer:
 
-	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {		
+	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {
+
 	    my $urlp = &Apache::lonnet::clutter($resource_src);
+
 	    my %form;
 	    my %moreenv;
 
@@ -1927,10 +1931,9 @@ sub print_page_in_course {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			$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}';
 		}
@@ -2198,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;
@@ -2225,7 +2229,7 @@ sub print_construction_sequence {
 	    }
 	    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
-	       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+	       ($urlp=~/$LONCAPA::assess_page_re/)) {
 		#  Don't permanently modify %$form...
 		my %answerform = %form;
 		$answerform{'grade_target'}='answer';
@@ -2269,16 +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);
 	    }
@@ -2450,11 +2445,11 @@ ENDPART
 	} else {
 
             #prints resource from the construction space
-	    $currentURL='/'.$helper->{'VARS'}->{'filename'};
-	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
+	    $currentURL=$helper->{'VARS'}->{'filename'};
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
+      
 	if ($cleanURL!~m|^/adm/|
 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
@@ -2494,6 +2489,7 @@ ENDPART
 
 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
@@ -2515,11 +2511,10 @@ ENDPART
 			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    } else {
-			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-			my $URLpath=$cleanURL;
-# FIXME: unclear URL path, not sure when this would occur
-			$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($cleanURL,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		}
@@ -2551,10 +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}';  
@@ -2716,7 +2707,7 @@ ENDPART
                             $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
                         }
 		    } else {
-			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {
+			if ($urlp=~/$LONCAPA::assess_page_re/) {
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
 #			    $texversion =~ s/\\begin{document}//; # FIXME
 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
@@ -3044,11 +3035,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') ||
@@ -3069,19 +3056,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);
@@ -3130,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:
@@ -3318,7 +3297,7 @@ sub print_resources {
 	$current_output .= &get_extra_vspaces($helper, $curresline);
 	$i++;
 	if ( !($type eq 'problems' && 
-	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) ) {
+	       ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
 		next;
@@ -3475,8 +3454,6 @@ sub handler {
     
     &init_perm();
 
-
-
     my $helper = printHelper($r);
     if (!ref($helper)) {
 	return $helper;
@@ -3640,8 +3617,8 @@ sub printHelper {
     }
 
     # Detect whether we're coming from construction space
-    if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
-        $helper->{VARS}->{'filename'} = "~$1/$2";
+    if ($env{'form.postdata'}=~m{^/priv}) {
+        $helper->{VARS}->{'filename'} = $env{'form.postdata'};
         $helper->{VARS}->{'construction'} = 1;
     } else {
         if ($env{'form.postdata'}) {