--- loncom/interface/lonprintout.pm	2002/09/09 19:27:42	1.57
+++ loncom/interface/lonprintout.pm	2002/09/10 20:14:35	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.57 2002/09/09 19:27:42 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.59 2002/09/10 20:14:35 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,6 +67,9 @@ ENDHEADER
 
 sub menu_for_output {
     my $r = shift;
+    my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
+#    $symbolic =~ m/([^_]+)_/;
+#    my $primary_sequence = '/res/'.$1;
     $r->print(<<ENDMENUOUT1);
 <h1>What do you want to print? Make a choice.</h1><br />
 <input type="hidden" name="phase" value="two">
@@ -78,13 +81,13 @@ ENDMENUOUT1
 	$r->print(<<ENDMENUOUT2);
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
-<input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />
-<br />
 ENDMENUOUT2
     }
     if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { 
 	$r->print(<<ENDMENUOUT6);
-  <input type="radio" name="choice" value="All class print">  Print assignment (all problems from the primary sequence) for group of students<br /><br />
+<input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />
+<br />
+<input type="radio" name="choice" value="All class print">  Print assignment (all problems from the primary sequence) for group of students<br /><br />
 ENDMENUOUT6
     }
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
@@ -106,10 +109,23 @@ ENDMENUOUT4
    <td>&nbsp;</td>
    <td rawspan="2">
      Number of columns: <select name="numberofcolumns">
-                         <option selected> 1 </option>
-                         <option> 2 </option>
+                         <option> 1 </option>
+                         <option selected> 2 </option>
                         </select> 
    </td>
+   <td rawspan="2">
+     Paper size (format [width x height]): <select name="papersize">
+                                            <option selected> Letter [216x297 mm] </option>
+                                            <option> Legal [216x356 mm] </option>
+                                            <option> Executive [190x254 mm] </option>
+                                            <option> Ledger/Tabloid [279x432 mm] </option>
+                                            <option> A2 [420x594 mm] </option>
+                                            <option> A3 [297x420 mm] </option>
+                                            <option> A4 [210x297 mm] </option>
+                                            <option> A5 [148x210 mm] </option>
+                                            <option> A6 [105x148 mm] </option>
+                                           </select> 
+   </td>
  </tr>
 </table>
 </br> 
@@ -118,6 +134,77 @@ ENDMENUOUT5
 }
 
 
+sub problem_choice_menu {
+    my $r = shift;
+    my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
+    $subdirtoprint =~ s/\/[^\/]+$//;
+    my @list_of_files = ();
+    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+	$subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
+    } else {
+	$subdirtoprint =~ s/.*(\/res\/)/$1/;
+    }
+    my @content_directory = ();
+    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
+    } else {
+	@content_directory = &Apache::lonnet::dirlist($subdirtoprint);
+    }
+    for (my $iy=0;$iy<=$#content_directory;$iy++) {
+	my @tempo_array = split(/&/,$content_directory[$iy]);
+	if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
+	    push(@list_of_files,$tempo_array[0]);
+	}
+    }
+    $subdirtoprint =~ s/\/$//;
+    for (my $i=0;$i<=$#list_of_files;$i++) {
+	$list_of_files[$i] = $subdirtoprint.'/'.$list_of_files[$i];
+    }
+    $r->print(<<ENDMENUOUT1);
+<input type="hidden" name="url" value="$ENV{'form.url'}">
+<input type="hidden" name="choice" value="$ENV{'form.choice'}">
+<input type="hidden" name="layout" value="$ENV{'form.layout'}">
+<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
+<h1>Mark problems which you want to print</h1>
+<script>
+    function checkall() {
+	for (i=0; i<document.forms.printform.elements.length; i++) {
+            if 
+          (document.forms.printform.elements[i].name.indexOf('whattoprint')==0) {
+	      document.forms.printform.elements[i].checked=true;
+            }
+        }
+    }
+
+
+    function uncheckall() {
+	for (i=0; i<document.forms.printform.elements.length; i++) {
+            if 
+          (document.forms.printform.elements[i].name.indexOf('whattoprint')==0) {
+	      document.forms.printform.elements[i].checked=false;
+            }
+        }
+    }
+</script>
+<input type=button onClick="checkall()" value="Check for All">&nbsp;
+<input type=button onClick="uncheckall()" value="Check for None">
+<p>
+ENDMENUOUT1
+    my $i;
+    foreach my $file (@list_of_files) {
+	$r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.
+                  $file);
+	$i++;
+    }
+    $r->print(<<ENDMENUOUT2);
+<br />
+<input type="hidden" name="numberofproblems" value="$i">
+<input type="hidden" name="phase" value="three">
+<input type="submit" value="Submit">
+ENDMENUOUT2
+}
+
+
 sub additional_class_menu {
     my $r = shift;
     $r->print(<<ENDMENUOUT1);
@@ -133,7 +220,6 @@ ENDMENUOUT1
 		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my $now=time;
     $r->print(<<ENDDISHEADER);
-<input type=hidden name=sendmode value=group>
 <script>
     function checkall() {
 	for (i=0; i<document.forms.printform.elements.length; i++) {
@@ -206,12 +292,16 @@ sub additional_print_menu {
     for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
 	$what_to_print .= '<input type="hidden" name="whomtoprint'.$i.'" value="'.$ENV{'form.whomtoprint'.$i}.'">';
     }
+    for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
+	$what_to_print .= '<input type="hidden" name="whattoprint'.$i.'" value="'.$ENV{'form.whattoprint'.$i}.'">';
+    }
     $r->print(<<ENDMENUOUT);
     $what_to_print
 <input type="hidden" name="url" value="$ENV{'form.url'}">
 <input type="hidden" name="choice" value="$ENV{'form.choice'}">
 <input type="hidden" name="layout" value="$ENV{'form.layout'}">
 <input type="hidden" name="numberofstudents" value="$ENV{'form.numberofstudents'}">
+<input type="hidden" name="numberofproblems" value="$ENV{'form.numberofproblems'}">
 <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
 Define page layout parameters: <br />
 <b>Width</b>: <input type="text" name="width" width="8" value="9cm"> <br />
@@ -243,9 +333,11 @@ ENDPART
     my $laystyle = 'book';
     my $result = '';
     my $number_of_columns = 1;
+    my $selectionmade = '';
  
     if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml  
+      $selectionmade = 1;
       my %moreenv;
       $moreenv{'form.grade_target'}='tex';
       if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
@@ -265,8 +357,7 @@ ENDPART
       #-- minimal sequence to which the current document belongs
         #-- where is the primary sequence containing file?
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
-	$_ = $symbolic;
-	m/([^_]+)_/;
+	$symbolic =~ m/([^_]+)_/;
 	my $primary_sequence = '/res/'.$1;
         #-- open and analyses the primary sequence
 	my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
@@ -279,6 +370,7 @@ ENDPART
             $_ = $1;
             my $urlp = $1;		
 	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
+		$selectionmade = 2;
 		if ($urlp =~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
 		    my %moreenv;
 		    $moreenv{'form.grade_target'}='tex';
@@ -288,6 +380,7 @@ ENDPART
 		    $result .= $texversion;        
 		}
 	    } elsif ($urlp =~ /\S+/) {
+		$selectionmade = 3;
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		&Apache::lonnet::appenv(%moreenv);
@@ -299,6 +392,7 @@ ENDPART
 	$result = &additional_cleanup($result);
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
         # where is the main sequence of the course?
+	$selectionmade = 4;
 	my $main_seq = '/res/'.$ENV{'request.course.uri'};
 	my $file=&Apache::lonnet::filelocation("",$main_seq);
 	my $filecontents=&Apache::lonnet::getfile($file);
@@ -361,6 +455,7 @@ ENDPART
 	$result = &additional_cleanup($result);
     } elsif ($choice eq 'All class print') { 
     #-- prints assignments for whole class or for selected students  
+	$selectionmade = 5;
         my (@students,@st_output) = ((),());
 	for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
 	    if ($ENV{'form.whomtoprint'.$i}=~/:/) {
@@ -397,64 +492,47 @@ ENDPART
 	    $current_output =~ s/\\begin{document}/\\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$fullname}}\\hskip 1\.4in } \\vskip 5 mm /;
 	    $result .= $current_output;
 	}
-
 	$result = &additional_cleanup($result);
-
-
-
-
-
-
     } elsif ($choice eq 'Subdirectory print') {      
-	my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
-	$subdirtoprint =~ s/\/[^\/]+$//;
-	my @list_of_files = ();
-	if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
-	    $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
-	} else {
-	    $subdirtoprint =~ s/.*(\/res\/)/$1/;
-	}
-	my @content_directory = ();
-	if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
-	    @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
-	} else {
-	    @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
-	}
-	for (my $iy=0;$iy<=$#content_directory;$iy++) {
-	    my @tempo_array = split(/&/,$content_directory[$iy]);
-	    if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
-		push(@list_of_files,$tempo_array[0]);
+    #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};
 	    }
 	}
-	$subdirtoprint =~ s/\/$//;
 	for (my $i=0;$i<=$#list_of_files;$i++) {
-	    my $urlp = $subdirtoprint.'/'.$list_of_files[$i];
-	    my %moreenv;
-	    $moreenv{'form.grade_target'}='tex';
-	    &Apache::lonnet::appenv(%moreenv);
-	    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { 
-		$urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; 
-	    }
-	    my $texversion=&Apache::lonnet::ssi($urlp);
-	    &Apache::lonnet::delenv('form.grade_target');
-	    $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
-	    $result .= $texversion;   
+	    my $urlp = $list_of_files[$i];
+	    if ($urlp=~/\//) {
+		my %moreenv;
+		$moreenv{'form.grade_target'}='tex';
+		&Apache::lonnet::appenv(%moreenv);
+		if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { 
+		    $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; 
+		}
+		my $texversion=&Apache::lonnet::ssi($urlp);
+		&Apache::lonnet::delenv('form.grade_target');
+		$texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
+		$result .= $texversion;
+	    }   
 	}
-	$result = &additional_cleanup($result);
-	
-       	
+	$result = &additional_cleanup($result);       	
     }
 #-- corrections for the different page formats
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {
+	$result =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{-40pt}\\setlength{\\evensidemargin}{-60pt}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{4\.4in}\\setlength{\\textheight}{6\.8in}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt} \\begin{document}/;
+	$result =~ s/\$number_of_columns/$number_of_columns/g;
+        $laystyle = 'album';
     } elsif ($layout eq 'CBI' and $numberofcolumns eq '2') {
 	$result =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{-40pt}\\setlength{\\evensidemargin}{-60pt}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{4\.4in}\\setlength{\\textheight}{6\.8in}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt} \\begin{document}/;
+	$result =~ s/\$number_of_columns/$number_of_columns/g;
         $laystyle = 'album';
     } elsif ($layout eq 'CAPA') {
         my $courseidinfo = $ENV{'request.role'};
         $_ = $courseidinfo;
         m/.*\/(.*)/;
         $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};
-#	$result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
 	$result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass{article}/;
 	if ($choice ne 'All class print') { 
 	    $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 9cm\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo} \\vskip 5 mm /;
@@ -473,6 +551,9 @@ ENDPART
     #changes page's parameters for the one column output 
     if ($ENV{'form.numberofcolumns'} == 1) {
 	$result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
+	$result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/;
+	$result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/;
+	$result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/;
     }
 #-- LaTeX corrections     
     my $first_comment = index($result,'<!--',0);
@@ -504,7 +585,7 @@ ENDPART
     } 
     print $temp_file $result;
 $r->print(<<FINALEND);
-<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns">
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
 </body>
 </html>
 FINALEND
@@ -928,6 +1009,7 @@ sub handler {
     my $r = shift;
     $r->content_type('text/html');
     $r->send_http_header;
+    $r->print(&Apache::loncommon::bodytag("Printing"));
 
 #-- start form
     &headerform($r);
@@ -939,6 +1021,8 @@ sub handler {
      if ($ENV{'form.phase'} eq 'two') {
 	 if($ENV{'form.choice'} eq 'All class print') {
 	     &additional_class_menu($r);
+	 } elsif($ENV{'form.choice'} eq 'Subdirectory print') {
+	     &problem_choice_menu($r);
 	 } else {
 	     $ENV{'form.phase'} = 'three';
 	 }