--- loncom/interface/lonprintout.pm	2003/05/02 19:18:39	1.144
+++ loncom/interface/lonprintout.pm	2003/05/06 13:50:23	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.144 2003/05/02 19:18:39 bowersj2 Exp $
+# $Id: lonprintout.pm,v 1.152 2003/05/06 13:50:23 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1349,15 +1349,6 @@ ENDPART
 	$laystyle='book';
     }
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns);
-
-
-
-   
-#    my $choice = $ENV{'form.choice'};
-#    my $layout = $ENV{'form.layout'};
-#    my $numberofcolumns = $ENV{'form.numberofcolumns'};  
-#    my $papersize = $ENV{'form.papersize'};          
-#    my $laystyle = 'book';
     my $assignment =  $ENV{'form.assignment'};
 #    if ($choice eq 'Subdirectory print') {
 #	if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
@@ -1430,12 +1421,6 @@ ENDPART
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-
-#	foreach  my $key (@master_seq) {
-#	    $r->print(' '.$key.'<br />');
-#	}
-#	return OK;
-
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    $master_seq[$i]=~/___\d+___(.*)$/;
 	    my $urlp='/res/'.$1;
@@ -1470,158 +1455,105 @@ 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 ($choice eq 'Standard LaTeX output for the top level sequence') {
-#        # where is the main sequence of the course?
-#	$selectionmade = 4;
-#	my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
-#	my @file_seq = &coming_from_hash($main_seq);
-#	for (my $i=0;$i<=$#file_seq;$i++) {
-#	    my ($path,$title,$symb) = split /&&/,$file_seq[$i];
-#	    $file_seq[$i] = $path.'&&'.$symb;
-#	}
-#	my $flag_latex_header_remove = 'NO';
-#        #-- produce an output string
-#	for (my $i=0;$i<=$#file_seq;$i++) {
-#	   if (not $file_seq[$i]=~/^&&/) {
-#	     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');		    
-#		if ($flag_latex_header_remove ne 'NO') {
-#		    $texversion = &latex_header_footer_remove($texversion);
-#		} else {
-#		    $texversion =~ s/\\end{document}//;
-#		}
-#		$result .= $texversion;  
-#		$flag_latex_header_remove = 'YES';
-#	     }		
-#	   }
-#	}	    
-#	$result .= '\end{document}';
-#    } elsif ($choice eq 'All class print') { 
-#    #-- prints assignments for whole class or for selected students  
-#	$selectionmade = 5;
-#        my @students = ();
-#	for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
-#	    if ($ENV{'form.whomtoprint'.$i}=~/:/) {
-#		push @students,$ENV{'form.whomtoprint'.$i};
-#	    }
-#	}
-#	#where is the primary sequence containing current resource (the same for all students)?
-#	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
-#	my @sequence = split('___',$symbolic);
-#	my $primary_sequence;
-#
-#	$primary_sequence=&Apache::lonnet::clutter($sequence[0]);
-#	my @master_seq = &coming_from_hash($primary_sequence); 
-#	for (my $i=0;$i<=$#master_seq;$i++) {
-#	    my ($path,$title,$symb) = split /&&/,$master_seq[$i];
-#	    $master_seq[$i] = $path.'&&'.$symb;
-#	}
-#        #loop over students
-#	my $flag_latex_header_remove = 'NO'; 
-#	my %moreenv;
-#	$moreenv{'form.textwidth'}=$LaTeXwidth;
-#	&Apache::lonnet::appenv(%moreenv);
-#	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
-#	foreach my $person (@students) {
-#	    my $current_output = ''; 
+     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') { 
+     #-- prints assignments for whole class or for selected students  
+	 $selectionmade=5;
+	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	 #loop over students
+	 my $flag_latex_header_remove = 'NO'; 
+	 my %moreenv;
+	 $moreenv{'form.textwidth'}=$LaTeXwidth;
+	 &Apache::lonnet::appenv(%moreenv);
+	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
+	 foreach my $person (@students) {
+	    my $current_output = ''; 
 #	    my ($usersection,$username,$userdomain) = split /:/,$person;
-#	    my $fullname = &get_name($username,$userdomain);
-#            #goes through all resources, checks if they are available for current student, and produces output   
-#	    foreach my $curresline (@master_seq)  {
-#		my ($curres,$symb) = split /&&/, $curresline;
-#                if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
-#		    my ($map,$id,$res_url) = split(/___/,$symb);
-#		    if (&Apache::lonnet::allowed('bre',$res_url)) {
-#			my $rendered = &Apache::loncommon::get_student_view($symb,$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}//;
-#			}
-#			$current_output .= $rendered;
-#		    }
-#		    $flag_latex_header_remove = 'YES';
-#		}
-#	    }
-#	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
-#	    if ($current_output=~/\\documentclass/) {
-#		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /;
-#	    } else {
-#		my $blanspages = '';
-#		for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
-#		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
-#	    }
-#	    $result .= $current_output;
-#	    &Apache::lonnet::delenv('form.counter');	    
-#	    &Apache::lonxml::init_counter(); 
-#	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-#						    'last student '.$fullname);
-#	}
-#	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-#	$result .= '\end{document}';
-#	&Apache::lonnet::delenv('form.textwidth');
-#    } elsif ($choice eq 'Subdirectory print') {      
-#    #prints selected problems from the subdirectory 
-#	$selectionmade = 6;
-#        my @list_of_files = ();
-#	for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
-#	    if ($ENV{'form.whattoprint'.$i}=~/^\//) {
-#		push @list_of_files,$ENV{'form.whattoprint'.$i};
-#	    }
-#	}	
-#	my $flag_latex_header_remove = 'NO';  
-#	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);
-#		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');
-#                #this chunck is responsible for printing the path to problem
-#		my $newurlp = '';
-#		my $HowMany = length($urlp)*2;
-#		if ($HowMany > $LaTeXwidth) {
-#		    my @temporrary = split '/',$urlp;
-#		    my $HowManyNew = 0;
-#		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
-#			if ($temporrary[$ii] ne '') {
-#			    $HowManyNew += length($temporrary[$ii])*2;
-#			    if ($HowManyNew < $LaTeXwidth ) {
-#				$newurlp .=  '/'.$temporrary[$ii];
-#			    } else {
-#				$HowManyNew = 0;
-#				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
-#				$ii--;
-#			    }
-#			}
-#		    }
-#		}
-#		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
-#		if ($flag_latex_header_remove ne 'NO') {
-#		    $texversion = &latex_header_footer_remove($texversion);
-#		} else {
-#		    $texversion =~ s/\\end{document}//;
-#		}
-#		$result .= $texversion;
-#	    }
-#	    $flag_latex_header_remove = 'YES';  
-#	}
-#	$result .= '\end{document}';      	
+	    my ($username,$userdomain) = split /:/,$person;
+	    my $fullname = &get_name($username,$userdomain);
+            #goes through all resources, checks if they are available for current student, and produces output   
+	    foreach my $curresline (@master_seq)  {
+		if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+		    my ($map,$id,$res_url) = split(/___/,$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}//;
+			}
+			$current_output .= $rendered;
+		    }
+		    $flag_latex_header_remove = 'YES';
+		}
+	    }
+	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+	    if ($current_output=~/\\documentclass/) {
+		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /;
+	    } else {
+		my $blanspages = '';
+		for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
+		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+	    }
+	    $result .= $current_output;
+	    &Apache::lonnet::delenv('form.counter');	    
+	    &Apache::lonxml::init_counter(); 
+	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+						    'last student '.$fullname);
+	}
+	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+	$result .= '\end{document}';
+	&Apache::lonnet::delenv('form.textwidth');
+    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {      
+    #prints selected problems from the subdirectory 
+	$selectionmade = 6;
+        my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
+	my $flag_latex_header_remove = 'NO';  
+	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);
+		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');
+                #this chunck is responsible for printing the path to problem
+		my $newurlp = '';
+		my $HowMany = length($urlp)*2;
+		if ($HowMany > $LaTeXwidth) {
+		    my @temporrary = split '/',$urlp;
+		    my $HowManyNew = 0;
+		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
+			if ($temporrary[$ii] ne '') {
+			    $HowManyNew += length($temporrary[$ii])*2;
+			    if ($HowManyNew < $LaTeXwidth ) {
+				$newurlp .=  '/'.$temporrary[$ii];
+			    } else {
+				$HowManyNew = 0;
+				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+				$ii--;
+			    }
+			}
+		    }
+		}
+		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
+		if ($flag_latex_header_remove ne 'NO') {
+		    $texversion = &latex_header_footer_remove($texversion);
+		} else {
+		    $texversion =~ s/\\end{document}//;
+		}
+		$result .= $texversion;
+	    }
+	    $flag_latex_header_remove = 'YES';  
+	}
+	$result .= '\end{document}';      	
     }
 #-------------------------------------------------------- corrections for the different page formats
     $result = &page_format_transformation_new($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
@@ -1685,12 +1617,12 @@ sub handler {
 
     return OK;
     }
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { return $loaderror; }
-    $loaderror=
-       &Apache::lonnet::overloaderror($r,
-         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-    if ($loaderror) { return $loaderror; }
+#    my $loaderror=&Apache::lonnet::overloaderror($r);
+#    if ($loaderror) { return $loaderror; }
+#    $loaderror=
+#       &Apache::lonnet::overloaderror($r,
+#         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+#    if ($loaderror) { return $loaderror; }
 
     $r->content_type('text/html');
     $r->send_http_header;
@@ -1774,22 +1706,30 @@ sub printHelper {
     Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     
     my $helper = Apache::lonhelper::helper->new("Printing Wizard");
+    $helper->declareVar('symb');
+    $helper->declareVar('postdata');
     
     # This will persistently load in the data we want from the
     # very first screen.
-    if (defined($ENV{'form.postdata'})) {
-        $helper->{VARS}->{'postdata'} = $ENV{'form.postdata'};
+    if ($ENV{'form.postdata'}) {
+        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
     }
-    if (defined($ENV{'form.symb'})) {
-        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+    if ($ENV{'form.symb'}) {
+        $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
     }
-    if (defined($ENV{'form.url'})) {
-        $helper->{VARS}->{'url'} = $helper->{VARS}->{'postdata'};
+    if ($ENV{'form.url'}) {
+        $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);
+
     if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
         my $url = $helper->{VARS}->{'postdata'};
         $resourceTitle = substr($url, rindex($url, '/') + 1);
@@ -1797,14 +1737,11 @@ sub printHelper {
 
     Apache::lonhelper::registerHelperTags();
 
-    # Extract map
-    my $symb = $helper->{VARS}->{'symb'};
-    my ($map, $id, $url) = split(/__/, $symb);
-
-    my $subdir = &Apache::lonnet::filelocation("", $helper->{VARS}->{'postdata'});
+    my $subdir = &Apache::lonnet::filelocation("", $url);
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
+    $subdir =  '/home/httpd/html/res'.$subdir;   #needs additional work for the construction space
 
     # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.
@@ -1839,8 +1776,7 @@ sub printHelper {
     <message>Select problems to print:</message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblemOrMap</filterfunc>
-      <choicefunc>return $isProblem</choicefunc>
+      <filterfunc>return $isProblem</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symb</valuefunc>
       </resource>
@@ -1850,7 +1786,7 @@ sub printHelper {
     <message>Select resources to print:</message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>
-      <choicefunc>return $isNotMap;</choicefunc>
+      <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symb</valuefunc>
       </resource>
@@ -1883,6 +1819,18 @@ HELPERFRAGMENT
   <state name="CHOOSE_STUDENTS" title="Choose Students">
     <message>Select the students you wish to print the problems for:</message>
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+    <resource variable="RESOURCES" multichoice="1">
+      <filterfunc>return $isProblem</filterfunc>
+      <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    <message>How should the results be printed?</message>
+    <choices variable="EMPTY_PAGES">
+      <choice computer='0'>Print all problems with no blank space between them</choice>
+      <choice computer='1'>Put each student's problems on a new page (add pagefeed after each student)</choice> <!-- ' -->
+      <choice computer='2'>Seperate each student's problems with a full blank page</choice> <!-- ' -->
+      <choice computer='3'>Seperate each student's problems with two full blank pages</choice> <!-- ' -->
+      </choices>
     </state>
 CHOOSE_STUDENTS
     }