--- loncom/interface/lonprintout.pm	2003/05/08 18:33:03	1.158
+++ loncom/interface/lonprintout.pm	2003/05/13 20:42:39	1.165
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.158 2003/05/08 18:33:03 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.165 2003/05/13 20:42:39 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1380,7 +1380,19 @@ ENDPART
 	    $moreenv{'form.textwidth'}=$LaTeXwidth;
 	    &Apache::lonnet::appenv(%moreenv);
 	    my $texversion=&Apache::lonnet::ssi($currentURL);
-	    &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+	    &Apache::lonnet::delenv('form.grade_target');
+	    &Apache::lonnet::delenv('form.textwidth');
+	    &Apache::lonnet::delenv('form.counter');
+	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		$moreenv{'form.grade_target'}='answer';
+		$moreenv{'form.print_answer'}='yes';
+		&Apache::lonnet::appenv(%moreenv);
+		my $answer=&Apache::lonnet::ssi($currentURL);
+		&Apache::lonnet::delenv('form.grade_target');
+		&Apache::lonnet::delenv('form.print_answer');
+#		$r->print('<pre>'.$answer.'</pre>'); return OK;
+		$texversion=~s/(\\end{document})/$answer$1/;
+	    }
 	    $result .= $texversion;
 	    if ($currentURL=~m/\.page\s*$/) {
 		($result,$number_of_columns) = &page_cleanup($result);
@@ -1394,8 +1406,6 @@ ENDPART
 #	  }
 #	  $result.=' \end{document}'
 	}
-
-
     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { 
@@ -1419,7 +1429,8 @@ ENDPART
 	    &Apache::lonnet::appenv(%moreenv);
 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
 	    my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$master_seq[$i]));
-	    &Apache::lonnet::delenv('form.grade_target','form.textwidth');
+	    &Apache::lonnet::delenv('form.grade_target');
+	    &Apache::lonnet::delenv('form.textwidth');
 	    if ($urlp=~/\.page$/) {
 		($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
 		if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
@@ -1506,7 +1517,8 @@ ENDPART
 		    $urlp =~ s|^/home/httpd/html||;
 		}
 		my $texversion=&Apache::lonnet::ssi($urlp);
-		&Apache::lonnet::delenv('form.grade_target','form.textwidth');
+		&Apache::lonnet::delenv('form.grade_target');
+		&Apache::lonnet::delenv('form.textwidth');
                 #this chunck is responsible for printing the path to problem
 		my $newurlp = '';
 		my $HowMany = length($urlp)*2;
@@ -1584,10 +1596,11 @@ sub handler {
         $helper = $result;
 	
 	
-#	my $key; 
-#	foreach $key (keys %{$helper->{'VARS'}}) {
-#	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
-#	}
+
+	my $key; 
+	foreach $key (keys %{$helper->{'VARS'}}) {
+	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
+	}
 #	return OK;
 	
 	
@@ -1751,16 +1764,9 @@ sub printHelper {
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
-    if (not defined $helper->{VARS}->{'construction'}) {
-	$subdir =  '/home/httpd/html/res'.$subdir;   
-    } else {
-	$helper->{VARS}->{'construction'}=~/^([^\/]+)\/\/([^\/]+)(.*)\/[^\/]*$/;
-	$subdir = $3;
-	$subdir=~/\/~([^\/]+)\/(.*)$/;
-	$subdir = '/home/'.$1.'/public_html/'.$2;
+    if (not $helper->{VARS}->{'construction'}) {
+	$subdir='/home/httpd/html/res/'.$subdir;
     }
-####    $r->print('Dir:  '.$subdir.'  ');
-####    return OK;
 
 
     # What can be printed is a very dynamic decision based on
@@ -1784,7 +1790,7 @@ sub printHelper {
     $r->print($helper->{VARS}->{'postdata'});
 
     # If we're in a sequence...
-    if (!defined($helper->{'VARS'}->{'construction'})) {
+    if ($helper->{'VARS'}->{'construction'} ne '1') {
         # Allow problems from sequence
         push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
@@ -1892,6 +1898,20 @@ CHOOSE_FROM_SUBDIR
     $helper->declareVar('PRINT_TYPE');
     $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();
+
+    if ($ENV{'request.role.adv'}) {
+        $paramHash = Apache::lonhelper::getParamHash();
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
+        Apache::lonhelper::message->new();
+        $paramHash = Apache::lonhelper::getParamHash();
+	$paramHash->{'variable'} = 'ANSWER_TYPE';   
+	$helper->declareVar('ANSWER_TYPE');         
+        $paramHash->{CHOICES} = [
+                                   ['Print without answer', 'yes'],
+                                   ['Print with answers', 'no'] ];
+        Apache::lonhelper::choices->new();
+    }
+
     Apache::lonprintout::page_format_state->new("FORMAT");
 
     # Generate the PAGESIZE state which will offer the user the margin