--- loncom/interface/lonprintout.pm	2002/03/21 18:46:15	1.19
+++ loncom/interface/lonprintout.pm	2002/05/21 00:44:03	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.19 2002/03/21 18:46:15 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.30 2002/05/21 00:44:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,22 +65,31 @@ ENDHEADER
 
 sub menu_for_output {
     my $r = shift;
-    $r->print(<<ENDMENUOUT);
+    $r->print(<<ENDMENUOUT1);
 <input type="hidden" name="phase" value="two">
 <input type="hidden" name="url" value="$ENV{'form.postdata'}">
-<input type="radio" name="choice" value="Standard LaTeX output for current document">  Current document
+<input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document
 (you will print what you see on the screen)<br />
 <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 />
+ENDMENUOUT1
+    if ($ENV{'user.adv'} eq '1') {
+	$r->print(<<ENDMENUOUT2);
+<input type="radio" name="choice" value="Subdirectory print">  All problems from particular subdirectory <input type="text" name="subdirect" value="/res/"><br />
+ENDMENUOUT2
+    }
+	$r->print(<<ENDMENUOUT3);
 <br /><hr /><br />
 <h1>And what page format do you prefer?</h1>
-<input type="radio" name="layout" value="CBI" checked>  CBI <br />
-<input type="radio" name="layout" value="CAPA"> CAPA <br />
+<input type="radio" name="layout" value="CBI"> Two columns landscape <br />
+<input type="radio" name="layout" value="CAPA" checked>  Two columns portrait <br />
 <input type="submit" value="Submit your choice">
 </form>
 </body>
 </html>
-ENDMENUOUT
+ENDMENUOUT3
 }
 
 
@@ -99,6 +108,7 @@ ENDPART
 
     my $choice = $ENV{'form.choice'};
     my $layout = $ENV{'form.layout'};
+    my $subdirtoprint = $ENV{'form.subdirect'};
     my $laystyle = 'book';
     my $result = '';
     my %mystyle;
@@ -116,8 +126,8 @@ ENDPART
       $moreenv{'request.filename'}=$currequest;
       &Apache::lonnet::appenv(%moreenv);
       $result .= $texversion;
-
-    } elsif ($choice eq 'Standard LaTeX output for the primary sequence') {
+      $result = &additional_cleanup($result);
+    } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
 #-- where is the primary sequence containing file?
 	my %moreenv;
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
@@ -134,25 +144,24 @@ ENDPART
 	    m/\"(.*)\"/;
             $_ = $1;
             my $urlp = $1;
-            if (/\.problem/) {
-		my %moreenv;
+	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
+		if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
+		    my %moreenv;
+		    $moreenv{'form.grade_target'}='tex';
+		    &Apache::lonnet::appenv(%moreenv);
+		    my $texversion=&Apache::lonnet::ssi($urlp);
+		    &Apache::lonnet::delenv('form.grade_target');
+		    $result .= $texversion;        
+		}
+	    } else {
 		$moreenv{'form.grade_target'}='tex';
 		&Apache::lonnet::appenv(%moreenv);
 		my $texversion=&Apache::lonnet::ssi($urlp);
 		&Apache::lonnet::delenv('form.grade_target');
-		$texversion =~ s!\.gif!\.eps!;
-		$result .= $texversion;        
+		$result .= $texversion;    
 	    }
-	}
-#-- additional cleanup for output	
-	my $first_app = index($result,'\documentclass',0);
-	$first_app = index($result,'\documentclass',$first_app+5);
-	while ($first_app != -1) {
-	    my $second_app = index($result,'begin{document}',$first_app);
-	    $first_app = rindex($result,'\end{document}',$first_app);
-	    substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';
-	    $first_app = index($result,'\documentclass',$first_app+5);
-	}
+	}	
+	$result = &additional_cleanup($result);
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
 	my @master_seq = ();
 	my @add_file_seq = ();
@@ -182,25 +191,53 @@ ENDPART
 	    m/\"(.*)\"/;
             $_ = $1;
             my $urlp = $1;
-            if (/\.problem/) {
+            if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		&Apache::lonnet::appenv(%moreenv);
 		my $texversion=&Apache::lonnet::ssi($urlp);
 		&Apache::lonnet::delenv('form.grade_target');
-		$texversion =~ s!\.gif!\.eps!;
 		$result .= $texversion;        
 	    }
+	}	    
+	$result = &additional_cleanup($result);
+    } elsif ($choice eq 'Subdirectory print') {  
+	if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
+	    my $locald = &Apache::lonnet::filelocation("",$subdirtoprint);
+	    unless (-e $locald) {
+#do something in the case of the absence of this subdirectory on the local mashine
+#replication process		
+	    }
+	    my @list_of_files = ();
+            my @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
+	    for (my $iy=0;$iy<=$#content_directory;$iy++) {
+                my @tempo_array = split(/&/,$content_directory[$iy]);
+		$content_directory[$iy] = $tempo_array[0];
+		if ($content_directory[$iy] =~ m/\.problem$/) {
+		    push @list_of_files,$content_directory[$iy];
+		}
+	    }
+	    for (my $i=0;$i<=$#list_of_files;$i++) {
+		$subdirtoprint =~ s/\/$//;
+		my $urlp = $subdirtoprint.'/'.$list_of_files[$i];
+		my %moreenv;
+		$moreenv{'form.grade_target'}='tex';
+		&Apache::lonnet::appenv(%moreenv);
+		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);
+
+	} else {
+#message "you not allowed to do this"	   
 	}
-#-- additional cleanup for output	
-	my $first_app = index($result,'\documentclass',0);
-	$first_app = index($result,'\documentclass',$first_app+5);
-	while ($first_app != -1) {
-	    my $second_app = index($result,'begin{document}',$first_app);
-	    $first_app = rindex($result,'\end{document}',$first_app);
-	    substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';
-	    $first_app = index($result,'\documentclass',$first_app+5);
-	}
+
+
+
+
+
     }
 #-- corrections for the different page formats
     if ($layout eq 'CBI') {
@@ -212,15 +249,30 @@ ENDPART
         m/.*\/(.*)/;
         $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};
 	$result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
-	$result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;
-	$result =~ s/\\includegraphics/\\includegraphics\[width=9\.0 cm\]/g;
+	$result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;
+	$result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;
+	$result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
+    }
+#-- LaTeX corrections     
+    my $first_comment = index($result,'<!--',0);
+    while ($first_comment != -1) {
+	my $end_comment = index($result,'-->',$first_comment);
+	substr($result,$first_comment,$end_comment-$first_comment+3) = '';
+	$first_comment = index($result,'<!--',$first_comment);
     }
-#-- LaTeX corrections 
     $result =~ s/^\s+$//gm; #remove empty lines
     $result =~ s/%/\\%/g;   #corrects %
+    $result =~ s/(\s)+/$1/g; #removes more than one empty space
+    $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
+    $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
+    $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
+    $result =~ s/{\\par }\s*\\\\/\\\\/gm;
+	$result =~ s/\\\\\s+\[/ \[/g;
+    $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
+    $result =~ s/\b_+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
 #-- writing .tex file in prtspool 
     my $temp_file;
-    $filename = "/home/httpd/prtspool/$ENV{'environment.firstname'}$ENV{'environment.lastname'}temp$ENV{'user.login.time'}.tex";
+    $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
     unless ($temp_file = Apache::File->new('>'.$filename)) {
 	$r->log_error("Couldn't open $filename for output $!");
 	return SERVER_ERROR; 
@@ -233,7 +285,18 @@ $r->print(<<FINALEND);
 FINALEND
 }
 
-
+sub additional_cleanup {
+    my $result = shift;	
+    my $first_app = index($result,'\documentclass',0);
+    $first_app = index($result,'\documentclass',$first_app+5);
+    while ($first_app != -1) {
+	my $second_app = index($result,'begin{document}',$first_app);
+	$first_app = rindex($result,'\end{document}',$first_app);
+	substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
+	$first_app = index($result,'\documentclass',$first_app+5);
+    }
+    return $result;
+}
 
 
 sub content_map {
@@ -306,12 +369,9 @@ sub handler {
     unless  ($ENV{'form.phase'}) {
 	&menu_for_output($r);
     }
-
-
 #-- core part 
     if ($ENV{'form.phase'} eq 'two') {
 	&output_data($r);
-
     }
     return OK;