--- loncom/interface/lonprintout.pm	2002/09/12 18:28:45	1.64
+++ loncom/interface/lonprintout.pm	2002/09/18 19:41:06	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.64 2002/09/12 18:28:45 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.69 2002/09/18 19:41:06 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;
 
@@ -87,7 +88,7 @@ sub menu_for_output {
 <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" checked>  Current document <b>$title_for_single_resource</b>
-(you will print what you saw on the screen)<br />
+(prints what you just saw on the screen)<br />
 ENDMENUOUT1
     if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
 	$r->print(<<ENDMENUOUT2);
@@ -360,9 +361,10 @@ ENDPART
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
       &Apache::lonnet::delenv('form.grade_target');
       $result .= $texversion;
-      $result = &additional_cleanup($result);
       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') {
@@ -370,18 +372,18 @@ 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
 	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') {
 		$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');
 		    $result .= $texversion;        
 		}
@@ -390,7 +392,7 @@ ENDPART
 		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;    
 	    }
@@ -403,7 +405,7 @@ ENDPART
 	my @file_seq = &coming_from_hash($main_seq); 
         #-- 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;
@@ -435,11 +437,11 @@ ENDPART
 	    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)  {
+	    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,
@@ -555,17 +557,57 @@ 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});
+    $symb = m/^([^___]*)___/;
+    my $presymb = $1.'___'; 
     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
+    if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
+		    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});
+    }
     return @resourcelist;
 }
 
@@ -909,19 +951,18 @@ sub additional_cleanup {
     }
     return $result;
 }
+
+
 sub page_cleanup {
     my $result = shift;	
-    $_ = $result;
-    m/\\end{document}(\d*)$/;
+ 
+    $result =~ m/\\end{document}(\d*)$/;
     my $number_of_columns = $1;
     my $insert = '{';
     for (my $id=1;$id<=$number_of_columns;$id++) { $insert .='l'; }
     $insert .= '}';
-    $result =~ s/(\\begin{longtable})INSERTTHEHEADOFLONGTABLE/$1$insert/g;
+    $result =~ s/(\\begin{longtable})INSERTTHEHEADOFLONGTABLE\\endfirsthead\\endhead/$1$insert/g;
     $result =~ s/&\s*REMOVETHEHEADOFLONGTABLE\\\\/\\\\/g;
-    $result =~ s/(\\vskip\s*\d+\s*mm)/}\\\\\\parbox{\\minipagewidth}{/g;
-    $result =~ s/\\parbox{\\minipagewidth}{}\s*\\\\\s*(\\parbox{\\minipagewidth})/$1/g;
-    $result =~ s/\\parbox{\\minipagewidth}{\s*\\\\\\\\/\\parbox{\\minipagewidth}{/g;
     return $result,$number_of_columns;
 }
 
@@ -949,6 +990,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"));