--- loncom/interface/lonprintout.pm	2003/05/06 20:50:04	1.155
+++ loncom/interface/lonprintout.pm	2003/05/15 14:55:24	1.175
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.155 2003/05/06 20:50:04 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.175 2003/05/15 14:55:24 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -481,15 +481,16 @@ ENDPART
       $selectionmade = 1;
       if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
         my %moreenv;
-        $moreenv{'form.grade_target'}='tex';
         if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
 	  $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
         }
         $moreenv{'request.filename'}=$ENV{'form.url'};
-        $moreenv{'form.textwidth'}=$LaTeXwidth;
+	my %form;
+        $form{'textwidth'}=$LaTeXwidth;
+        $form{'grade_target'}='tex';
         &Apache::lonnet::appenv(%moreenv);
-        my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
-        &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+        my $texversion=&Apache::lonnet::ssi($ENV{'form.url'},%form);
+        &Apache::lonnet::delenv('form.counter');
         $result .= $texversion;
         if ($ENV{'form.url'}=~m/\.page\s*$/) {
 	  ($result,$number_of_columns) = &page_cleanup($result);
@@ -523,13 +524,12 @@ ENDPART
 	    } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
               $selectionmade = 3;
 	    }
-	   my %moreenv;
-	   $moreenv{'form.grade_target'}='tex';
-	   $moreenv{'form.textwidth'}=$LaTeXwidth;
-	   &Apache::lonnet::appenv(%moreenv);
+	   my %form;
+	   $form{'textwidth'}=$LaTeXwidth;
+	   $form{'grade_target'}='tex';
+	   $form{'symb'}=$symb;
 	   #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
-	   my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
-	   &Apache::lonnet::delenv('form.grade_target','form.textwidth');
+	   my $texversion=&Apache::lonnet::ssi($urlp,%form);
 	   if ($urlp =~ m/\.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;} 
@@ -563,12 +563,11 @@ ENDPART
 	     my ($urlp,$symb) = split /&&/, $file_seq[$i];
 	     $urlp=~s/\/home\/httpd\/html//;	    
 	     if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
-		my %moreenv;
-		$moreenv{'form.grade_target'}='tex';
-		$moreenv{'form.textwidth'}=$LaTeXwidth;
-		&Apache::lonnet::appenv(%moreenv);
-		my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
-		&Apache::lonnet::delenv('form.grade_target','form.textwidth');		    
+		my %form;
+		$form{'grade_target'}='tex';
+		$form{'textwidth'}=$LaTeXwidth;
+		$form{'symb'}=$symb;
+		my $texversion=&Apache::lonnet::ssi($urlp,%form);
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
 		} else {
@@ -658,17 +657,15 @@ ENDPART
 	for (my $i=0;$i<=$#list_of_files;$i++) {
 	    my $urlp = $list_of_files[$i];
 	    if ($urlp=~/\//) {
-		my %moreenv;
-		$moreenv{'form.grade_target'}='tex';
-		$moreenv{'form.textwidth'}=$LaTeXwidth;
-		&Apache::lonnet::appenv(%moreenv);
+		my %form;
+		$form{'grade_target'}='tex';
+		$form{'textwidth'}=$LaTeXwidth;
 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
 		} else {
 		    $urlp =~ s|^/home/httpd/html||;
 		}
-		my $texversion=&Apache::lonnet::ssi($urlp);
-		&Apache::lonnet::delenv('form.grade_target','form.textwidth');
+		my $texversion=&Apache::lonnet::ssi($urlp,%form);
                 #this chunck is responsible for printing the path to problem
 		my $newurlp = '';
 		my $HowMany = length($urlp)*2;
@@ -1037,7 +1034,6 @@ sub character_chart {
     $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
     $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
     $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
-
     return $result;
 }
 
@@ -1045,6 +1041,8 @@ sub character_chart {
     sub page_format {
 	my ($papersize,$layout,$numberofcolumns) = @_; 
 	my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
+
+
 	if ($papersize=~/Letter/) {
 	    if ($layout eq 'CAPA') {
 		if ($numberofcolumns == 1) {
@@ -1363,28 +1361,41 @@ ENDPART
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my $currentURL;
-	if (not defined $helper->{'VARS'}->{'construction'}) {
+	if ($helper->{'VARS'}->{'construction'} ne '1') {
+            #prins published resource
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
 	} else {
-	    $currentURL=$helper->{'VARS'}->{'construction'};
+            #prins resource from the construction space
+	    $currentURL=$helper->{'VARS'}->{'filename'};
+	    $currentURL=~s/\/home\//\/~/;
+	    $currentURL=~s/public_html\///;
 	}
 	$selectionmade = 1;
 	if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
-        my %moreenv;
-        $moreenv{'form.grade_target'}='tex';
-	if (&Apache::lonnet::allowed('bre',$currentURL)) {
-	    $currentURL=~s/http:\/\/[^\/]+//;
-	}
-        $moreenv{'request.filename'}=$currentURL;
-        $moreenv{'form.textwidth'}=$LaTeXwidth;
-        &Apache::lonnet::appenv(%moreenv);
-        my $texversion=&Apache::lonnet::ssi($currentURL);
-        &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
-        $result .= $texversion;
-        if ($currentURL=~m/\.page\s*$/) {
-	  ($result,$number_of_columns) = &page_cleanup($result);
-        }
-      } else {
+	    my %moreenv;
+	    $moreenv{'request.filename'}=$currentURL;
+	    my %form;
+	    $form{'grade_target'}='tex';
+	    $form{'textwidth'}=$LaTeXwidth;
+	    my $rndseed=time;
+	    $form{'rndseed'}=$rndseed;
+	    &Apache::lonnet::appenv(%moreenv);
+	    my $texversion=&Apache::lonnet::ssi($currentURL,%form);
+	    &Apache::lonnet::delenv('form.counter');
+	    &Apache::lonnet::delenv('request.filename');
+	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		my %form;
+		$form{'grade_target'}='answer';
+		$form{'answer_output_mode'}='tex';
+		$form{'rndseed'}=$rndseed;
+		my $answer=&Apache::lonnet::ssi($currentURL,%form);
+		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+	    }
+	    $result .= $texversion;
+	    if ($currentURL=~m/\.page\s*$/) {
+		($result,$number_of_columns) = &page_cleanup($result);
+	    }
+	} else {
 #	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
 #	  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
 #	      $result.=$1;
@@ -1392,9 +1403,7 @@ ENDPART
 #	      $result.=$ENV{'form.url'};
 #	  }
 #	  $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')) { 
@@ -1412,13 +1421,12 @@ ENDPART
 	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
 		$selectionmade = 4;
 	    }
-	    my %moreenv;
-	    $moreenv{'form.grade_target'}='tex';
-	    $moreenv{'form.textwidth'}=$LaTeXwidth;
-	    &Apache::lonnet::appenv(%moreenv);
+	    my %form;	   
+	    $form{'grade_target'}='tex';
+	    $form{'textwidth'}=$LaTeXwidth;
+	    $form{'symb'}=$master_seq[$i];
 	    #&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');
+	    my $texversion=&Apache::lonnet::ssi($urlp,%form);
 	    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;} 
@@ -1430,6 +1438,13 @@ ENDPART
 	    } else {
 		$texversion =~ s/\\end{document}//;
 	    }
+	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		my %form;
+		$form{'grade_target'}='answer';
+		$form{'answer_output_mode'}='tex';
+		my $answer=&Apache::lonnet::ssi($urlp,%form);
+		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+	    }
 	    $result .= $texversion;         
 	    $flag_latex_header_remove = 'YES';   
 	}
@@ -1464,6 +1479,13 @@ ENDPART
 			} else {
 			    $rendered =~ s/\\end{document}//;
 			}
+			if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+			    my %form;
+			    $form{'answer_output_mode'}='tex';
+			    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,
+										      $ENV{'request.course.id'},%form);
+			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+			}
 			$current_output .= $rendered;
 		    }
 		    $flag_latex_header_remove = 'YES';
@@ -1491,21 +1513,29 @@ ENDPART
 	$selectionmade = 6;
         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
 	@list_of_files=sort @list_of_files;
-	my $flag_latex_header_remove = 'NO';  
+	my $flag_latex_header_remove = 'NO'; 
+	my $rndseed=time;
 	for (my $i=0;$i<=$#list_of_files;$i++) {
 	    my $urlp = $list_of_files[$i];
 	    if ($urlp=~/\//) {
-		my %moreenv;
-		$moreenv{'form.grade_target'}='tex';
-		$moreenv{'form.textwidth'}=$LaTeXwidth;
-		&Apache::lonnet::appenv(%moreenv);
+		my %form;
+		$form{'grade_target'}='tex';
+		$form{'textwidth'}=$LaTeXwidth;
+		$form{'rndseed'}=$rndseed;
 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
 		} else {
 		    $urlp =~ s|^/home/httpd/html||;
 		}
-		my $texversion=&Apache::lonnet::ssi($urlp);
-		&Apache::lonnet::delenv('form.grade_target','form.textwidth');
+		my $texversion=&Apache::lonnet::ssi($urlp,%form);
+		if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		    my %form;
+		    $form{'grade_target'}='answer';
+		    $form{'answer_output_mode'}='tex';
+		    $form{'rndseed'}=$rndseed;
+		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		}
                 #this chunck is responsible for printing the path to problem
 		my $newurlp = '';
 		my $HowMany = length($urlp)*2;
@@ -1535,6 +1565,7 @@ ENDPART
 	    }
 	    $flag_latex_header_remove = 'YES';  
 	}
+	if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;}
 	$result .= '\end{document}';      	
     }
 #-------------------------------------------------------- corrections for the different page formats
@@ -1583,10 +1614,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;
 	
 	
@@ -1689,14 +1721,29 @@ sub printHelper {
     
     my $helper = Apache::lonhelper::helper->new("Printing Wizard");
     $helper->declareVar('symb');
-    $helper->declareVar('postdata');
+    $helper->declareVar('postdata');    
+    $helper->declareVar('filename');
+    $helper->declareVar('construction');
     
     # This will persistently load in the data we want from the
     # very first screen.
-    if ($ENV{'form.postdata'}) {
-	if ($ENV{'form.postdata'}!~/\/res\//) {$helper->{VARS}->{'construction'} = $ENV{'form.postdata'};}
-        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+    # Detect whether we're coming from construction space
+    if ($ENV{'form.postdata'} =~ /http:\/\// ) {
+        $ENV{'form.postdata'} =~ /http:\/\/[a-zA-Z.]+\/~([a-zA-Z0-9]+)\/(.*)/;
+        $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
+        $helper->{VARS}->{'construction'} = 1;
+    } else {
+        if ($ENV{'form.postdata'}) {
+            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+        }
+        if ($ENV{'form.symb'}) {
+            $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+        }
+        if ($ENV{'form.url'}) {
+            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+        }
     }
+
     if ($ENV{'form.symb'}) {
         $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
     }
@@ -1704,37 +1751,40 @@ sub printHelper {
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
 
     }
-
     
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
     $helper->{VARS}->{'assignment'} = $sequenceTitle;
 
+    
     # Extract map
     my $symb = $helper->{VARS}->{'symb'};
-    my ($map, $id, $url) = split(/___/, $symb);
-    $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+    my ($map, $id, $url);
+    my $subdir;
 
-    if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
-        my $url = $helper->{VARS}->{'postdata'};
-        $resourceTitle = substr($url, rindex($url, '/') + 1);
+    # Get the resource name from construction space
+    if ($helper->{VARS}->{'construction'}) {
+        $resourceTitle = substr($helper->{VARS}->{'filename'}, 
+                                rindex($helper->{VARS}->{'filename'}, '/')+1);
+        $subdir = substr($helper->{VARS}->{'filename'},
+                         0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
+    } else {
+        ($map, $id, $url) = split(/___/, $symb);
+        $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+
+        if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
+            my $url = $helper->{VARS}->{'postdata'};
+            $resourceTitle = substr($url, rindex($url, '/') + 1);
+        }
+        $subdir = &Apache::lonnet::filelocation("", $url);
     }
 
     Apache::lonhelper::registerHelperTags();
 
-    my $subdir = &Apache::lonnet::filelocation("", $url);
-
     # "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
@@ -1750,12 +1800,15 @@ sub printHelper {
     # the helper by hand.
     my $printChoices = [];
     my $paramHash;
-    # We can always print the current screen.
 
-    push @{$printChoices}, ["Current resource <b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+    if ($resourceTitle) {
+        push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+    }
+
+    $r->print($helper->{VARS}->{'postdata'});
 
     # If we're in a sequence...
-    if (not 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
@@ -1802,7 +1855,7 @@ HELPERFRAGMENT
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1">
+    <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap</filterfunc>
       <choicefunc>return $isProblem</choicefunc>
@@ -1863,6 +1916,21 @@ CHOOSE_FROM_SUBDIR
     $helper->declareVar('PRINT_TYPE');
     $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();
+
+    if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
+	($helper->{VARS}->{'construction'} eq '1')) {
+        $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