--- loncom/interface/lonprintout.pm	2002/08/09 18:06:46	1.48
+++ loncom/interface/lonprintout.pm	2002/08/14 20:38:04	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.48 2002/08/09 18:06:46 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.51 2002/08/14 20:38:04 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -140,7 +140,6 @@ ENDPART
     my $laystyle = 'book';
     my $result = '';
     my $number_of_columns = 1;
-#    my $number_of_columns = $ENV{'form.numberofcolumns'};    
  
     if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml  
@@ -196,8 +195,6 @@ ENDPART
 	}	
 	$result = &additional_cleanup($result);
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
-	my @master_seq = ();
-	my @add_file_seq = ();
         # where is the main sequence of the course?
 	my $main_seq = '/res/'.$ENV{'request.course.uri'};
 	my $file=&Apache::lonnet::filelocation("",$main_seq);
@@ -206,85 +203,59 @@ ENDPART
 	for (my $iu=0;$iu<=$#file_seq;$iu++) {
 	    $file_seq[$iu]=~s/^"//;
 	    $file_seq[$iu]=~s/"$//;
-	    $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
-#remove	    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
+	    if ($file_seq[$iu]=~m/\S+/) {
+		$file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
+	    } else {
+		$file_seq[$iu]= 'REMOVE IT PLEASE';
+	    }
 	}
 	my $i=0;
-        while ($i<=$#file_seq) {
+        my $limit = $#file_seq;		    
+        while ($i<=$limit) {	
 	    unless ($file_seq[$i]=~m/\.(problem|page)/) {
 		if ($file_seq[$i]=~m/\.sequence/) {
 		    my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
 		    my @newfile_seq = &content_map($filecontents);
-		    $result .=' START '.$i.'   LOOK  '.$filecontents.' FINISH  ';
-#		    splice @file_seq,$1,1,@newfile_seq;
-#		    $i=-1;
+		    for (my $iu=0;$iu<=$#newfile_seq;$iu++) {
+			$newfile_seq[$iu]=~s/^"//;
+	                $newfile_seq[$iu]=~s/"$//;
+			if ($newfile_seq[$iu]=~m/\S+/) {
+			    $newfile_seq[$iu]=&Apache::lonnet::filelocation("",$newfile_seq[$iu]);
+			} else {
+			    $newfile_seq[$iu]= 'REMOVE IT PLEASE';
+			}
+		    }
+		    splice @file_seq,$i,1,@newfile_seq;
+		    $i=0;
+		    $limit = $#file_seq;
 		} else {
-		    splice @file_seq,$1,1;
+		    splice @file_seq,$i,1,'REMOVE IT PLEASE';
 		}
 	    }
-
-
-
-
 	    $i++;
 	}
 	for (my $iu=0;$iu<=$#file_seq;$iu++) {
-	    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
+	    if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
+		splice @file_seq,$iu,1;
+	    }
+	}
+	if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
+	    pop @file_seq;
 	}
-
-
-        # do we have any other sequence inside?
-#	$result.=$#file_seq.'   ';
-##	my $i=1;
-##	while ($i<=$#file_seq) {
-#	    $result.='      '.$file_seq[$i].'    ';
-##	    $file_seq[$i]=~s/^"//;
-##	    $file_seq[$i]=~s/"$//;
-##	    if ($file_seq[$i]=~m/\.sequence\s*$/) {
-##		$file = &Apache::lonnet::filelocation("",$file_seq[$i]);
-#		$result.='  location    '.$file.'   ';
-#		$result .= 'FFFFFFFFF'.$file.'  ';
-##		$filecontents=&Apache::lonnet::getfile($file);
-##		@add_file_seq = &content_map($filecontents);
-
-#
-#	for (my $iu=0;$iu<=$#add_file_seq;$iu++) {
-#	    $result .= ' SDSD '.$add_file_seq[$iu].' FDFD   ';
-#	}
-#
-
-
-##		splice(@file_seq,$i,1,@add_file_seq);
-##		@add_file_seq = ();
-##		$i = -1;
-##	    }
-##	    $i++;
-##	    last; #do not forget to remove 
-##	}
-##	@master_seq = @file_seq;	
-
-#
-#	for (my $iu=0;$iu<=$#file_seq;$iu++) {
-#	    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
-#	}
-#
-
 #-- produce an output string
-###	for (my $i=0;$i<=$#master_seq;$i++) {
-###	    $_ = $master_seq[$i];
-###	    m/\"(.*)\"/;
-###         $_ = $1;
-###            my $urlp = $1;
-###            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;        
-###	    }
-###	}	    
-###	$result = &additional_cleanup($result);
+	for (my $i=0;$i<=$#file_seq;$i++) {
+            my $urlp = $file_seq[$i];
+	    $urlp=~s/\/home\/httpd\/html//;	    
+            if ($urlp=~m/\.(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;        
+	    }
+	}	    
+	$result = &additional_cleanup($result);
     } elsif ($choice eq 'Subdirectory print') {      
 	my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
 	$subdirtoprint =~ s/\/[^\/]+$//;
@@ -322,11 +293,7 @@ ENDPART
 	}
 	$result = &additional_cleanup($result);
 	
-	
-
-
-
-	
+       	
     }
 #-- corrections for the different page formats
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {
@@ -344,7 +311,7 @@ ENDPART
 	$result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;
 #	$result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/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/;
-	$result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
+	$result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny \\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright Michigan State University Board of Trustees $1/;
 #        $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;
         $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
         $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
@@ -381,7 +348,7 @@ ENDPART
     } 
     print $temp_file $result;
 $r->print(<<FINALEND);
-<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle">
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns">
 </body>
 </html>
 FINALEND