--- loncom/interface/lonprintout.pm	2002/08/02 18:08:12	1.45
+++ loncom/interface/lonprintout.pm	2002/09/04 04:03:00	1.51.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.45 2002/08/02 18:08:12 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.51.2.1 2002/09/04 04:03:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ sub menu_for_output {
 <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 />
 ENDMENUOUT1
-    if (not $ENV{'request.role'}=~m/^au\./) {
+    if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
     $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 />
@@ -145,7 +145,9 @@ ENDPART
       #-- single document - problem, page, html, xml  
       my %moreenv;
       $moreenv{'form.grade_target'}='tex';
-      if ($ENV{'request.role'}=~m/^au\./) {$ENV{'form.url'}=~s/http:\/\/[^\/]+//;}
+      if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+	  $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
+      }
       $moreenv{'request.filename'}=$ENV{'form.url'};
       &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
@@ -167,11 +169,6 @@ ENDPART
 	my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
 	my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
 	my @master_seq = &content_map($sequencefilecontents);
-#
-#	for (my $iu=0;$iu<=$#master_seq;$iu++) {
-#	    $result .= ' '.$master_seq[$iu].'    ';
-#	}
-#
         #-- produce an output string
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    $_ = $master_seq[$i];
@@ -187,7 +184,7 @@ ENDPART
 		    &Apache::lonnet::delenv('form.grade_target');
 		    $result .= $texversion;        
 		}
-	    } else {
+	    } elsif ($urlp =~ /\S+/) {
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		&Apache::lonnet::appenv(%moreenv);
@@ -198,35 +195,58 @@ 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?
+        # where is the main sequence of the course?
 	my $main_seq = '/res/'.$ENV{'request.course.uri'};
 	my $file=&Apache::lonnet::filelocation("",$main_seq);
 	my $filecontents=&Apache::lonnet::getfile($file);
 	my @file_seq = &content_map($filecontents);
-#-- do we have any other sequence inside?
+	for (my $iu=0;$iu<=$#file_seq;$iu++) {
+	    $file_seq[$iu]=~s/^"//;
+	    $file_seq[$iu]=~s/"$//;
+	    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) {
-	    $_ = $file_seq[$i];
-	    if (/\.sequence$/) {
-		$file = &Apache::lonnet::filelocation("",$file_seq[$i]);
-		$filecontents=&Apache::lonnet::getfile($file);
-		@add_file_seq = &content_map($filecontents);
-		splice(@file_seq,$i,1,@add_file_seq);
-		@add_file_seq = ();
-		$i = -1;
+        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);
+		    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,$i,1,'REMOVE IT PLEASE';
+		}
 	    }
 	    $i++;
 	}
-	@master_seq = @file_seq;	
+	for (my $iu=0;$iu<=$#file_seq;$iu++) {
+	    if ($file_seq[$iu]=~m/REMOVE IT PLEASE/) {
+		splice @file_seq,$iu,1;
+	    }
+	}
+	if ($file_seq[-1]=~m/REMOVE IT PLEASE/) {
+	    pop @file_seq;
+	}
 #-- 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)/) {
+	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);
@@ -240,27 +260,21 @@ ENDPART
 	my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
 	$subdirtoprint =~ s/\/[^\/]+$//;
 	my @list_of_files = ();
-	if ($ENV{'request.role'}=~m/^au\./) {
+	if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
 	    $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
 	} else {
 	    $subdirtoprint =~ s/.*(\/res\/)/$1/;
 	}
-	if ($ENV{'request.role'}=~m/^au\./) {
-	    my @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
-	    for (my $iy=0;$iy<=$#content_directory;$iy++) {
-		my @tempo_array = split(/&/,$content_directory[$iy]);
-		if ($tempo_array[0] =~ m/^[^\.]+\.problem$/) {
-		    push(@list_of_files,$tempo_array[0]);
-		}
-	    }
+	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 {
-	    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];
-		}
+	    @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/\/$//;
@@ -269,8 +283,8 @@ ENDPART
 	    my %moreenv;
 	    $moreenv{'form.grade_target'}='tex';
 	    &Apache::lonnet::appenv(%moreenv);
-	    if ($ENV{'request.role'}=~m/^au\./) {
-		$urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/;
+	    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');
@@ -279,11 +293,7 @@ ENDPART
 	}
 	$result = &additional_cleanup($result);
 	
-	
-
-
-
-	
+       	
     }
 #-- corrections for the different page formats
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {
@@ -301,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;
@@ -315,10 +325,9 @@ ENDPART
 	$first_comment = index($result,'<!--',$first_comment);
     }
     $result =~ s/^\s+$//gm; #remove empty lines
-    $result =~ s/([^\\])%/\$1\%/g;   #corrects %
+    $result =~ s/\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;
@@ -339,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