--- loncom/interface/lonprintout.pm	2007/04/20 20:33:35	1.499
+++ loncom/interface/lonprintout.pm	2007/07/25 19:15:29	1.504
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.499 2007/04/20 20:33:35 foxr Exp $
+# $Id: lonprintout.pm,v 1.504 2007/07/25 19:15:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,19 +60,13 @@ sub fetch_raw_resource {
     my ($url) = @_;
 
     my $filename  = &Apache::lonnet::filelocation("", $url);
-    #
-    # fetch if needed:
-    #
-    if (! -e $filename) {
-	my $repcopy_result = &Apache::lonnet::repcopy($filename);
+    my $contents  = &Apache::lonnet::getfile($filename);
 
-	if ($repcopy_result ne 'ok') {
-	    return "File open failed for $filename";   # This will bomb the print.
-	}
+    if ($contents == -1) {
+	return "File open failed for $filename";      # This will bomb the print.
     }
-    my $contents = &Apache::lonnet::readfile($filename);
-
     return $contents;
+
     
 }
 
@@ -873,7 +867,11 @@ sub page_format_transformation {
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
 
     if ($selectionmade eq '4') {
-	$assignment='Problems from the Whole Course';
+	if ($choice eq 'all_problems') {
+	    $assignment='Problems from the Whole Course';
+	} else {
+	    $assignment='Resources from the Whole Course';
+	}
     } else {
 	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
     }
@@ -1373,6 +1371,14 @@ ENDPART
     if ($helper->{'VARS'}->{'showallfoils'} eq "1") { 
 	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
     }
+    
+    if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+	&Apache::lonnet::appenv('construct.style' =>
+				$helper->{'VARS'}->{'style_file'});
+    } elsif ($env{'construct.style'}) {
+	&Apache::lonnet::delenv('construct\\.style');
+    }
+
 
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
@@ -1396,12 +1402,6 @@ ENDPART
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
 		my %moreenv;
 		$moreenv{'request.filename'}=$cleanURL;
-		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
-		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
-		    my $dom = $env{'user.domain'};
-		    my $user = $env{'user.name'};
-		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
-		}
                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
@@ -1450,7 +1450,7 @@ ENDPART
 			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
 			my $URLpath=$cleanURL;
 			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
-			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+			$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		}
@@ -2607,7 +2607,7 @@ CHOOSE_STUDENTS
        </validator>
     </string>
     <message></td></tr><tr><td></message>
-    <message><b>Names to store the CODEs under for later:</b></message>
+    <message><b>Names to save the CODEs under for later:</b></message>
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
     <message></td></tr><tr><td></message>
@@ -2718,7 +2718,7 @@ CHOOSE_STUDENTS1
        </validator>
     </string>
     <message></td></tr><tr><td></message>
-    <message><b>Names to store the CODEs under for later:</b></message>
+    <message><b>Names to save the CODEs under for later:</b></message>
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
     <message></td></tr><tr><td></message>
@@ -2948,17 +2948,19 @@ CHOOSE_FROM_ANY_SEQUENCE
 	        </defaultvalue>
 	    </string>
 	     <message></td></tr><tr><td align="right">
-             <label for="style_file_value">$stylefiletext</label>:
+             <label for="style_file">$stylefiletext</label>:
              </td><td></message>
-             <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file_value','sty')">Select style file</a> </td><tr><td></message>
+             <string variable="style_file" size="40">
+		<defaultvalue>
+	            return $env{'construct.style'};
+	        </defaultvalue>
+             </string><message>&nbsp; <a href="javascript:openbrowser('helpform','style_file_forminput','sty')">Select style file</a> </td><tr><td></message>
 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
                 <choice computer="1">Show all foils?</choice>
              </choices>
 	     <message></td></tr></message>
 RNDSEED
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
-	    
 	} 
     }