--- loncom/interface/lonprintout.pm	2003/09/30 14:43:26	1.243
+++ loncom/interface/lonprintout.pm	2003/10/15 18:01:10	1.255
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.243 2003/09/30 14:43:26 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.255 2003/10/15 18:01:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,17 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1 Gerd Kortemeyer
-#
-# 9/17 Alex Sakharuk
 #
 package Apache::lonprintout;
 
@@ -51,6 +40,7 @@ use Apache::File();
 use Apache::lonnavmaps;
 use Apache::lonratedt;
 use POSIX qw(strftime);
+use Apache::lonlocal;
 use GDBM_File;
 
 
@@ -656,6 +646,8 @@ sub path_to_problem {
 		}
 	    }
 	}
+    } else {
+	$newurlp=$urlp;
     }
     return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
 }
@@ -740,8 +732,15 @@ ENDPART
 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 		} else {
 		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-		    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
-		    $texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
+		    if ($helper->{'VARS'}->{'construction'} ne '1') {
+			$texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+			$texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
+		    } else {
+			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
+			my $URLpath=$currentURL;
+			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
+			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		}
 	    }
@@ -769,21 +768,33 @@ ENDPART
 		$Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;
 		my $urlp=$2;
 		if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
-		    my %form;
-		    $form{'grade_target'}='tex';
-		    $form{'textwidth'}=$LaTeXwidth;
-		    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
-		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-		    $form{'rndseed'}=$rndseed;
-		    my $texversion=&Apache::lonnet::ssi($urlp,%form);
-		    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		    my $texversion='';
+		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
+			my %form;
+			$form{'grade_target'}='tex';
+			$form{'textwidth'}=$LaTeXwidth;
+			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+			$form{'rndseed'}=$rndseed;
+			$texversion=&Apache::lonnet::ssi($urlp,%form);
+		    }
+		    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
+		       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
 			my %form;
 			$form{'grade_target'}='answer';
 			$form{'answer_output_mode'}='tex';
 			$form{'rndseed'}=$rndseed;
                         if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
 			my $answer=&Apache::lonnet::ssi($urlp,%form);
-			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+			    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+			} else {
+			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+			    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+			    $texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
+			    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
+			}
 		    }
 		    if ($flag_latex_header_remove ne 'NO') {
 			$texversion = &latex_header_footer_remove($texversion);
@@ -817,7 +828,8 @@ ENDPART
 	}
     } 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')) { 
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') or
+	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
         #-- produce an output string
 	my %form=();	   
 	$form{'grade_target'}='tex';
@@ -839,10 +851,13 @@ ENDPART
 		$selectionmade = 3;
 	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
 		$selectionmade = 4;
+	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
+		$selectionmade = 7;
 	    }
 	    $form{'symb'}=$master_seq[$i];
 	    my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
+	    if ($i==0) {$prevassignment=$assignment;}
 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
 	    my $texversion=&Apache::lonnet::ssi($urlp,%form);
 	    if ($urlp=~/\.page$/) {
@@ -851,24 +866,36 @@ ENDPART
 		$texversion =~ s/\\end{document}\d*/\\end{document}/;
 		$flag_page_in_sequence = 'YES';
 	    } 
-	    if ($flag_latex_header_remove ne 'NO') {
-		$texversion = &latex_header_footer_remove($texversion);
-	    } else {
-		$texversion =~ s/\\end{document}//;
-	    }
-	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 		my %form;
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
 		my $answer=&Apache::lonnet::ssi($urlp,%form);
-		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		} else {
+		    if ($urlp=~/\.(problem|exam|quiz|library)$/) {
+			$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+			$texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($urlp).'}\vskip 0 mm ';
+			$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
+			$texversion.='\vskip 1 mm '.$answer;
+		    } else {
+			$texversion='';
+		    }
+		}
+	    }
+	    if ($flag_latex_header_remove ne 'NO') {
+		$texversion = &latex_header_footer_remove($texversion);
+	    } else {
+		$texversion =~ s/\\end{document}//;
 	    }
 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
 		$texversion=&IndexCreation($texversion,$urlp);
 	    }
-	    if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
-		my ($name,$courseidinfo) = &get_name;
-		$courseidinfo = &get_course();
+	    if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
+		my $name = &get_name();
+		my $courseidinfo = &get_course();
 		if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		$prevassignment=$assignment;
 		$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
@@ -879,9 +906,13 @@ ENDPART
 	&Apache::lonnet::delenv('form.counter');
 	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
 	$result .= '\end{document}';
-     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') { 
+     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) { 
      #-- prints assignments for whole class or for selected students  
-	 $selectionmade=5;
+	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
+	     $selectionmade=5;
+	 } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
+	     $selectionmade=8;
+	 }
 	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	 #loop over students
@@ -901,22 +932,30 @@ ENDPART
 	    &Apache::lonnet::delenv('form.counter');
 	    &Apache::lonxml::init_counter();
 	    foreach my $curresline (@master_seq)  {
-		if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+		if ((($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) && ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students')) || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')) {
 		    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 		    if (&Apache::lonnet::allowed('bre',$res_url)) {
 			my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
                                                                         $ENV{'request.course.id'},'tex');
-			if ($flag_latex_header_remove eq 'YES') {
-			    $rendered = &latex_header_footer_remove($rendered);
-			} else {
-			    $rendered =~ s/\\end{document}//;
-			}
-			if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+			if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+			   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 			    my %form;
 			    $form{'answer_output_mode'}='tex';
 			    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 			    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
-			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+			    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+				$rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+			    } else {
+				$rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+				$rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
+				$rendered.=&path_to_problem ($curresline,$LaTeXwidth);
+				$rendered.='\vskip 1 mm '.$ansrendered;
+			    }
+			}
+			if ($flag_latex_header_remove eq 'YES') {
+			    $rendered = &latex_header_footer_remove($rendered);
+			} else {
+			    $rendered =~ s/\\end{document}//;
 			}
 			$current_output .= $rendered;
 		    }
@@ -937,7 +976,7 @@ ENDPART
 	    &Apache::lonnet::delenv('form.counter');	    
 	    &Apache::lonxml::init_counter(); 
 	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-						    'last student '.$fullname);
+					     &mt('last student').' '.$fullname);
 	}
 	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	$result .= '\end{document}';
@@ -954,6 +993,7 @@ ENDPART
 	}
 	for (my $i=0;$i<=$#list_of_files;$i++) {
 	    my $urlp = $list_of_files[$i];
+	    $urlp=~s|//|/|;
 	    if ($urlp=~/\//) {
 		my %form;
 		$form{'grade_target'}='tex';
@@ -965,17 +1005,34 @@ ENDPART
 		    $urlp =~ s|^/home/httpd/html||;
 		}
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
-		if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 		    my %form;
 		    $form{'grade_target'}='answer';
 		    $form{'answer_output_mode'}='tex';
 		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		    $form{'rndseed'}=$rndseed;
 		    my $answer=&Apache::lonnet::ssi($urlp,%form);
-		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		    } else {
+			$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+			if ($helper->{'VARS'}->{'construction'} ne '1') {
+			    $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 1 mm '.$answer.'\end{document}';
+		    }
 		}
                 #this chunck is responsible for printing the path to problem
-		my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
+		my $newurlp=$urlp;
+		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
+		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
@@ -1202,7 +1259,7 @@ sub printHelper {
     my $paramHash;
 
     if ($resourceTitle) {
-        push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+        push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
     }
 
 #    $r->print($helper->{VARS}->{'postdata'});
@@ -1228,9 +1285,9 @@ sub printHelper {
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
-        push @{$printChoices}, ["<b>Problems</b> in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, ["<b>Problems</b> in <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, ["<b>Resources</b> in $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+        push @{$printChoices}, ["<b>Resources</b> in <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
@@ -1260,9 +1317,9 @@ HELPERFRAGMENT
     # If the user is priviledged, allow them to print all 
     # problems in the course, optionally for selected students
     if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
-        push @{$printChoices}, ['Problems from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+        push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, ["Problems from $sequenceTitle for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
+	    push @{$printChoices}, ["<b>Problems</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
 	}
 
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
@@ -1281,9 +1338,9 @@ HELPERFRAGMENT
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1">
-      <filterfunc>return $isProblem</filterfunc>
+      <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
-      <valuefunc>return $symbFilter</valuefunc>
+      <valuefunc>return $symbFilter;</valuefunc>
       </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
@@ -1294,11 +1351,34 @@ HELPERFRAGMENT
       </choices>
     </state>
 CHOOSE_STUDENTS
+
+	if ($helper->{VARS}->{'assignment'}) {
+	    push @{$printChoices}, ["<b>Resources</b> from <b><i>$sequenceTitle</i></b> for <b>selected students</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
+	}
+        &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
+  <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
+    <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
+    <resource variable="RESOURCES" multichoice="1" addstatus="1">
+      <filterfunc>return $isNotMap;</filterfunc>
+      <mapurl>$map</mapurl>
+      <valuefunc>return $symbFilter;</valuefunc>
+      </resource>
+    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+    <choices variable="EMPTY_PAGES">
+      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
+      </choices>
+    </state>
+CHOOSE_STUDENTS1
+
     }
 
     # FIXME: That RE should come from a library somewhere.
     if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne '/home/httpd/html/res/') {    
-        push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+        push @{$printChoices}, ["<b>Problems</b> from current subdirectory <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
 
         my $f = '$filename';
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
@@ -1324,8 +1404,12 @@ CHOOSE_FROM_SUBDIR
     # Allow the user to select any sequence in the course, feed it to
     # another resource selector for that sequence
     if (!$helper->{VARS}->{'construction'}) {
-	push @$printChoices, ["Resources from <b>selected sequence</b> in course",
-			      'map_problems_pages', 'CHOOSE_SEQUENCE'];
+	push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> in course",
+			      'select_sequences', 'CHOOSE_SEQUENCE'];
+	my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
+	#Escape apostrophes and backslashes for Perl
+	$escapedSequenceName =~ s/\\/\\\\/g;
+	$escapedSequenceName =~ s/'/\\'/g;
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
   <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>
@@ -1340,7 +1424,7 @@ CHOOSE_FROM_SUBDIR
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem</filterfunc>
-      <mapurl evaluate='1'>return $helper->{VARS}->{'SEQUENCE'};</mapurl>
+      <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
       </resource>
     </state>