--- loncom/interface/lonprintout.pm	2011/11/07 16:00:17	1.606
+++ 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.606 2011/11/07 16:00:17 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);
 
@@ -2228,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';
@@ -2706,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]);
@@ -3113,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:
@@ -3301,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;