--- loncom/interface/lonprintout.pm	2003/05/05 18:48:15	1.150
+++ loncom/interface/lonprintout.pm	2003/05/06 20:09:49	1.154
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.150 2003/05/05 18:48:15 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.154 2003/05/06 20:09:49 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';}
@@ -1386,15 +1377,15 @@ ENDPART
 	$LaTeXwidth = $1*25.4;
     }
     $LaTeXwidth.=' mm';
-
-
+    
+    
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my $currentURL;
-	if (defined $helper->{'VARS'}->{'url'}) {
-	    $currentURL=$helper->{'VARS'}->{'url'};
-	} else {
+	if (not defined $helper->{'VARS'}->{'construction'}) {
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
+	} else {
+	    $currentURL=$helper->{'VARS'}->{'construction'};
 	}
 	$selectionmade = 1;
 	if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
@@ -1482,10 +1473,7 @@ ENDPART
 	    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)/) {
 		if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
-#		    my ($map,$id,$res_url) = split(/___/,$symb);$curresres
 		    my ($map,$id,$res_url) = split(/___/,$curresline);
 		    if (&Apache::lonnet::allowed('bre',$res_url)) {
 			my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
@@ -1517,60 +1505,56 @@ ENDPART
 	&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}';      	
+    } 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'};
+	@list_of_files=sort @list_of_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'});
@@ -1616,12 +1600,12 @@ sub handler {
             return $result;
         }
         $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;
 	
 	
@@ -1729,6 +1713,7 @@ sub printHelper {
     # 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'});
     }
     if ($ENV{'form.symb'}) {
@@ -1736,6 +1721,7 @@ sub printHelper {
     }
     if ($ENV{'form.url'}) {
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+
     }
 
     
@@ -1758,6 +1744,17 @@ 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;
+    }
+####    $r->print('Dir:  '.$subdir.'  ');
+####    return OK;
+
 
     # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.
@@ -1777,7 +1774,7 @@ sub printHelper {
     push @{$printChoices}, ["<b>$resourceTitle</b> (exactly what was on the screen)", 'current_document', 'PAGESIZE'];
 
     # If we're in a sequence...
-    if ($helper->{VARS}->{'postdata'} =~ /\/res\//) {
+    if (not defined $helper->{'VARS'}->{'construction'}) {
         # Allow problems from sequence
         push @{$printChoices}, ["Problems from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
@@ -1842,17 +1839,17 @@ HELPERFRAGMENT
       </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> <!-- ' -->
+      <choice computer='0'>Print students assignments without separations (as uniform flow)</choice>
+      <choice computer='1'>Start student assignment from new page (add pagefeed after each student)</choice>
+      <choice computer='2'>Add one emty page after each student assignment</choice> 
+      <choice computer='3'>Add two emty page after each student assignment</choice> 
       </choices>
     </state>
 CHOOSE_STUDENTS
     }
 
     # 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)/)) {    
+    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'}) {    
         push @{$printChoices}, ["Problems from <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         
         my $f = '$filename';