--- loncom/interface/lonprintout.pm	2003/05/06 19:23:49	1.153
+++ loncom/interface/lonprintout.pm	2003/05/08 19:16:42	1.160
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.153 2003/05/06 19:23:49 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.160 2003/05/08 19:16:42 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1350,24 +1350,6 @@ ENDPART
     }
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns);
     my $assignment =  $ENV{'form.assignment'};
-#    if ($choice eq 'Subdirectory print') {
-#	if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
-#	if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
-#	if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
-#    }
-#    if (($choice eq 'Standard LaTeX output for current document') &&
-#	($ENV{'form.url'}=~m|^/~|)) {
-#	if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
-#	if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
-#	if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
-#    }
-
-    
-#    my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
-#    if ($numberofcolumns == 1) {
-#	$textwidth=$ENV{'form.width'};
-#	$textheight=$ENV{'form.height'};
-#    }
     my $LaTeXwidth; 
     if ($textwidth=~/(\d+)\s*cm/) {
 	$LaTeXwidth = $1*10;
@@ -1378,32 +1360,32 @@ ENDPART
     }
     $LaTeXwidth.=' mm';
     
-    
     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{'form.grade_target'}='tex';
+	    $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 {
 #	  $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;
@@ -1411,9 +1393,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')) { 
@@ -1509,6 +1489,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];
@@ -1603,7 +1584,7 @@ sub handler {
 	
 #	my $key; 
 #	foreach $key (keys %{$helper->{'VARS'}}) {
-#	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<br />');
+#	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
 #	}
 #	return OK;
 	
@@ -1707,14 +1688,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'};
     }
@@ -1722,37 +1718,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
@@ -1768,24 +1767,27 @@ sub printHelper {
     # the helper by hand.
     my $printChoices = [];
     my $paramHash;
-    # We can always print the current screen.
 
-    push @{$printChoices}, ["<b>$resourceTitle</b> (exactly what was 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}, ["Problems from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, ["Problems and pages from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+        push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
         my $isProblem = '$res->is_problem();';
         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
         my $isNotMap = '!$res->is_map();';
         my $symb = '$res->symb();';
         my $helperFragment = <<HELPERFRAGMENT;
-  <state name="CHOOSE_PROBLEMS" title="Select Problems">
-    <message>Select problems to print:</message>
+  <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem</filterfunc>
@@ -1794,8 +1796,8 @@ sub printHelper {
       </resource>
     </state>
 
-  <state name="CHOOSE_PROBLEMS_HTML" title="Select Resources">
-    <message>Select resources to print:</message>
+  <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap;</filterfunc>
@@ -1811,15 +1813,15 @@ HELPERFRAGMENT
     # If the user is priviledged, allow them to print all 
     # problems in the course, optionally for selected students
     if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
-        push @{$printChoices}, ['<b>All problems</b> in course (may take a lot of time)', 'all_problems', 'ALL_PROBLEMS'];
+        push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
         push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
 
         my $isProblem = '$res->is_problem();';
         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
         my $symb = '$res->symb();';
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
-  <state name="ALL_PROBLEMS" title="Select Problems">
-    <message>Select problems to print:</message>
+  <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap</filterfunc>
@@ -1828,15 +1830,16 @@ HELPERFRAGMENT
       </resource>
     </state>
 
-  <state name="CHOOSE_STUDENTS" title="Choose Students">
-    <message>Select the students you wish to print the problems for:</message>
+  <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">
+    <message>(do not forget to select assignment itself - make another selection below) <br /></message>
     <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">
       <filterfunc>return $isProblem</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symb</valuefunc>
       </resource>
-    <message>How should the results be printed?</message>
+    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
       <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>
@@ -1849,12 +1852,12 @@ 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)/)) or defined $helper->{'VARS'}->{'construction'}) {    
-        push @{$printChoices}, ["Problems from <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+        push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         
         my $f = '$filename';
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
-  <state name="CHOOSE_FROM_SUBDIR" title="Select Files">
-    <message>Select problems you wish to print from <b>$subdir</b></message>
+  <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
+    <message>(mark them then click "next" button) <br /></message>
     <files variable="FILES" multichoice='1'>
       <nextstate>PAGESIZE</nextstate>
       <filechoice>return '$subdir';</filechoice>
@@ -1871,9 +1874,9 @@ CHOOSE_FROM_SUBDIR
     }
 
     # Generate the first state, to select which resources get printed.
-    Apache::lonhelper::state->new("START", "Selecting Resources to Print");
+    Apache::lonhelper::state->new("START", "What do you want to print? Make a choice.");
     $paramHash = Apache::lonhelper::getParamHash();
-    $paramHash->{MESSAGE_TEXT} = "What do you want to print?";
+    $paramHash->{MESSAGE_TEXT} = "";
     Apache::lonhelper::message->new();
     $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = 'PRINT_TYPE';
@@ -1968,19 +1971,19 @@ sub render {
 
     $result .= <<STATEHTML;
 
-<p>How should the printing be formatted?</p>
+<p><big><i><b>What page format do you prefer?</b></i></big></p>
 <table cellpadding="3">
   <tr>
-    <td align="center"><b>Layout</b></td>
-    <td align="center"><b>Columns</b></td>
+    <td align="center"><b>Page layout</b></td>
+    <td align="center"><b>Number of columns</b></td>
     <td align="center"><b>Paper type</b></td>
   </tr>
   <tr>
     <td>
-      <input type="radio" name="${var}.layout" value="L" checked='1' /> Landscape<br />
-      <input type="radio" name="${var}.layout" value="P" /> Portrait
+      <input type="radio" name="${var}.layout" value="L" /> Landscape<br />
+      <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait
     </td>
-    <td>
+    <td align="center">
       <select name="${var}.cols">
 STATEHTML