--- loncom/interface/lonprintout.pm	2003/05/06 13:50:23	1.152
+++ 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.152 2003/05/06 13:50:23 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.154 2003/05/06 20:09:49 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1377,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)$/) {
@@ -1509,6 +1509,7 @@ ENDPART
     #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];
@@ -1599,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;
 	
 	
@@ -1712,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'}) {
@@ -1719,6 +1721,7 @@ sub printHelper {
     }
     if ($ENV{'form.url'}) {
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+
     }
 
     
@@ -1741,7 +1744,17 @@ sub printHelper {
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
-    $subdir =  '/home/httpd/html/res'.$subdir;   #needs additional work for the construction space
+    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.
@@ -1761,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
@@ -1826,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';