--- loncom/interface/lonprintout.pm	2002/09/16 14:20:33	1.65
+++ loncom/interface/lonprintout.pm	2002/09/19 20:18:09	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.65 2002/09/16 14:20:33 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.72 2002/09/19 20:18:09 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,7 @@ use Apache::inputtags;
 use Apache::grades;
 use Apache::edit;
 use Apache::File();
+use Apache::lonnavmaps;
 use POSIX qw(strftime);
 use GDBM_File;
 
@@ -92,7 +93,7 @@ ENDMENUOUT1
     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 <b>$title_for_sequence</b><br />
-<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  All problems plus any html/xml files from <b>$title_for_sequence</b><br />
+<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  All problems plus any pages or html/xml files from <b>$title_for_sequence</b><br />
 ENDMENUOUT2
     }
     if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { 
@@ -344,7 +345,7 @@ ENDPART
     my $numberofcolumns = $ENV{'form.numberofcolumns'};               
     my $laystyle = 'book';
     my $result = '';
-    my $number_of_columns = 1;
+    my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my $selectionmade = '';
  
     if ($choice eq 'Standard LaTeX output for current document') {
@@ -358,13 +359,10 @@ ENDPART
       $moreenv{'request.filename'}=$ENV{'form.url'};
       &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
-      &Apache::lonnet::logthis(" Got $result");
       &Apache::lonnet::delenv('form.grade_target');
       $result .= $texversion;
       if ($ENV{'form.url'}=~m/\.page\s*$/) {
 	  ($result,$number_of_columns) = &page_cleanup($result);
-      } else {
-	  $result = &additional_cleanup($result);
       }
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
              $choice eq 'Standard LaTeX output for whole primary sequence') {
@@ -372,51 +370,81 @@ ENDPART
         #-- where is the primary sequence containing file?
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
 	$symbolic =~ m/([^_]+)_/;
-	my $primary_sequence = '/res/'.$1;
-	my @master_seq = &coming_from_hash($primary_sequence); 
+	my $primary_sequence = '/res/'.$1;    
+	my @master_seq = &coming_from_hash($primary_sequence);
         #-- produce an output string
+	my $flag_latex_header_remove = 'NO';
+	my $flag_page_in_sequence = 'NO';
 	for (my $i=0;$i<=$#master_seq;$i++) {
-            my $urlp = $master_seq[$i];		
+            my ($urlp,$symb) = split /&&/, $master_seq[$i];		
 	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
+            #prints only problems
 		$selectionmade = 2;
  		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);
+		    my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
 		    &Apache::lonnet::delenv('form.grade_target');
+		    if ($flag_latex_header_remove ne 'NO') {
+			$texversion = &latex_header_footer_remove($texversion);
+		    } else {
+			$texversion =~ s/\\end{document}//;
+		    }
 		    $result .= $texversion;        
+		    $flag_latex_header_remove = 'YES';
 		}
 	    } elsif ($urlp =~ /\S+/) {
+              #prints problems, pages and any html/xml files
 		$selectionmade = 3;
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		&Apache::lonnet::appenv(%moreenv);
-		my $texversion=&Apache::lonnet::ssi($urlp);
+		my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
 		&Apache::lonnet::delenv('form.grade_target');
-		$result .= $texversion;    
+		if ($urlp =~ m/\.page/) {
+		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
+		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
+		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
+		    $flag_page_in_sequence = 'YES';
+		} 
+		if ($flag_latex_header_remove ne 'NO') {
+		    $texversion = &latex_header_footer_remove($texversion);
+		} else {
+		    $texversion =~ s/\\end{document}//;
+		}
+		$result .= $texversion;         
+		$flag_latex_header_remove = 'YES';   
 	    }
-	}	
-	$result = &additional_cleanup($result);
+	}		
+	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
+	$result .= '\end{document}';
     }  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_seq = &coming_from_hash($main_seq); 
+	my @file_seq = &coming_from_hash($main_seq); 	
+	my $flag_latex_header_remove = 'NO';
         #-- produce an output string
 	for (my $i=0;$i<=$#file_seq;$i++) {
-            my $urlp = $file_seq[$i];
+            my ($urlp,$symb) = split /&&/, $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');
+		&Apache::lonnet::delenv('form.grade_target');		    
+		if ($flag_latex_header_remove ne 'NO') {
+		    $texversion = &latex_header_footer_remove($texversion);
+		} else {
+		    $texversion =~ s/\\end{document}//;
+		}
 		$result .= $texversion;        
-	    }
+	    }		
+	    $flag_latex_header_remove = 'YES';  
 	}	    
-	$result = &additional_cleanup($result);
+	$result .= '\end{document}';
     } elsif ($choice eq 'All class print') { 
     #-- prints assignments for whole class or for selected students  
 	$selectionmade = 5;
@@ -431,29 +459,40 @@ ENDPART
 	$symbolic =~ m/([^_]+)_/;
 	my $primary_sequence = '/res/'.$1;
 	my @master_seq = &coming_from_hash($primary_sequence); 
-       #loop over students
+        #loop over students
+	my $flag_latex_header_remove = 'NO';  
 	foreach my $person (@students) {
 	    my $current_output = ''; 
 	    my ($usersection,$username,$userdomain) = split /:/,$person;
 	    my $fullname = &Apache::grades::get_fullname($username,$userdomain);
-            #goes through all resources, checks if they are available for current student, and produces output 
-	    foreach my $curres (@master_seq)  {
+            #goes through all resources, checks if they are available for current student, and produces output   
+	    foreach my $curresline (@master_seq)  {
+		my ($curres,$symb) = split /&&/, $curresline;
 		$curres =~ s/^"//;
 		$curres =~ s/"$//;
                 if ($curres=~/\w+/) {
-		    my $symb = &Apache::lonnet::symbread($curres);
 		    my ($map,$id,$res_url) = split(/___/,$symb);
 		    if (&Apache::lonnet::allowed('bre',$res_url)) {
 			my $rendered = &Apache::loncommon::get_student_view($symb,$username,$userdomain,
                                                                         $ENV{'request.course.id'},'tex');
+			if ($flag_latex_header_remove ne 'NO') {
+			    $rendered = &latex_header_footer_remove($rendered);
+			} else {
+			    $rendered =~ s/\\end{document}//;
+			}
 			$current_output .= $rendered;
 		    }
 		}
+		$flag_latex_header_remove = 'YES';  
+	    }
+	    if ($current_output=~/\\documentclass/) {
+		$current_output =~ s/\\begin{document}/\\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$fullname}}\\hskip 1\.4in } \\vskip 5 mm /;
+	    } else {
+		$current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
 	    }
-	    $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);
+	$result .= '\end{document}'; 
     } elsif ($choice eq 'Subdirectory print') {      
     #prints selected problems from the subdirectory 
 	$selectionmade = 6;
@@ -462,7 +501,8 @@ ENDPART
 	    if ($ENV{'form.whattoprint'.$i}=~/^\//) {
 		push @list_of_files,$ENV{'form.whattoprint'.$i};
 	    }
-	}
+	}	
+	my $flag_latex_header_remove = 'NO';  
 	for (my $i=0;$i<=$#list_of_files;$i++) {
 	    my $urlp = $list_of_files[$i];
 	    if ($urlp=~/\//) {
@@ -475,10 +515,16 @@ ENDPART
 		my $texversion=&Apache::lonnet::ssi($urlp);
 		&Apache::lonnet::delenv('form.grade_target');
 		$texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
+		if ($flag_latex_header_remove ne 'NO') {
+		    $texversion = &latex_header_footer_remove($texversion);
+		} else {
+		    $texversion =~ s/\\end{document}//;
+		}
 		$result .= $texversion;
-	    }   
+	    }
+	    $flag_latex_header_remove = 'YES';  
 	}
-	$result = &additional_cleanup($result);       	
+	$result .= '\end{document}';      	
     }
 #-- corrections for the different page formats
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {
@@ -557,20 +603,54 @@ sub coming_from_hash {
 
     my $mainsequence = shift;
     my @resourcelist = ();
+    my $mapid = $hash{'map_pc_'.$mainsequence};
     my $mapstart = $hash{'map_start_'.$mainsequence};
     my $mapfinish = $hash{'map_finish_'.$mainsequence};
+    my $symb = &Apache::lonnet::symbread($hash{'src_'.$mapstart});
+    my ($presymb) = split(/___/,$symb);
+    $presymb = $presymb.'___';
     my $current_resource = $mapstart;
     while ($current_resource ne $mapfinish) {
 	if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
-	    push @resourcelist,$hash{'src_'.$current_resource};
+	    my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
+            if ($rid=~/,/) {
+		my @rid = split /,/, $rid;
+		foreach my $rid_element (@rid) {
+		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
+			$rid = $1; 
+			last;
+		    }
+		}
+	    } else {
+		$rid =~ m/^$mapid\.(\d*)/;
+                $rid = $1;  
+	    }
+	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
+	    $symb = $presymb.$rid.'___'.$1;
+	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
 	} else {
 	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
 	}
 	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
     }
-    #needs if final resource in the map (type=finish) contains something
+    #needs if final resource in the map (type="finish") contains something
     if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
-	push @resourcelist,$hash{'src_'.$current_resource};
+		    my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
+            if ($rid=~/,/) {
+		my @rid = split /,/, $rid;
+		foreach my $rid_element (@rid) {
+		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
+			$rid = $1; 
+			last;
+		    }
+		}
+	    } else {
+		$rid =~ m/^$mapid\.(\d*)/;
+                $rid = $1;  
+	    }
+	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
+	    $symb = $presymb.$rid.'___'.$1;
+	push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
     } else {
 	push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
     }
@@ -578,6 +658,14 @@ sub coming_from_hash {
 }
 
 
+sub latex_header_footer_remove {
+    my $text = shift;
+    $text =~ s/\\end{document}//;
+    $text =~ s/\\documentclass([^&]*)\\begin{document}//;
+    return $text;
+}
+
+
 sub character_chart {
     my $result = shift;	
     $result =~ s/&#0?0?7;//g;
@@ -905,18 +993,7 @@ sub character_chart {
 
 #'"`
 
-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 page_cleanup {
     my $result = shift;	
  
@@ -954,6 +1031,14 @@ sub details_for_menu {
 sub handler {
 
     my $r = shift;
+
+    my $loaderror=&Apache::lonnet::overloaderror($r);
+    if ($loaderror) { return $loaderror; }
+    $loaderror=
+       &Apache::lonnet::overloaderror($r,
+         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+    if ($loaderror) { return $loaderror; }
+
     $r->content_type('text/html');
     $r->send_http_header;
     $r->print(&Apache::loncommon::bodytag("Printing"));