--- loncom/interface/lonprintout.pm	2008/03/28 15:22:48	1.525
+++ loncom/interface/lonprintout.pm	2008/03/31 09:51:11	1.527
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.525 2008/03/28 15:22:48 www Exp $
+# $Id: lonprintout.pm,v 1.527 2008/03/31 09:51:11 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,12 +164,11 @@ sub get_student_view_with_retries {
     my ($content, $response) = &Apache::loncommon::get_student_view_with_retries($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv);
     if (!$response->is_success) {
         $ssi_error               = 1;
-        $ssi_last_error_resource = $curresline;
+        $ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
         $ssi_last_error          = $response->code . " " . $response->message;
         $content='\section*{!!! An error occured !!!}';
-        &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error");
+        &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
     }
-
     return $content;
 
 }
@@ -1144,6 +1143,11 @@ sub print_latex_header {
 	     '\usepackage{wrapfig}'.
 	     '\usepackage{picins}\usepackage{calc}'."\n".
 	     '\usepackage[utf8]{inputenc}'."\n".
+	     '\usepackage{amsmath}'.
+	     '\usepackage{amssymb}'.
+	     '\usepackage{amsfonts}'.
+	     '\usepackage{amsthm}'.
+	     '\usepackage{amscd}'.
 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
@@ -2186,13 +2190,13 @@ ENDPART
         my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
         my $end_page = &Apache::loncommon::end_page();
         $r->print('<br /><h2>'.&mt('An unrecoverable network error occurred:').'</h2><p>  '.
-                  &mt('One of the resources ([_1]) you chose to print could not be rendered due to an unrecoverable error when communicating with a server:',
-                  $ssi_last_error_resource).' <br />'.$ssi_last_error.
-                  '</p><p>'.&mt('Make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
+                  &mt('At least one of the resources you chose to print could not be rendered due to an unrecoverable error when communicating with a server:').
+                  '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
+                  '</p><p>'.&mt('You can continue using the link provided below, but make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
                   &mt('You may be able to reprint the individual resources for which this error occured, as the issue may be temporary.').
                   '<br />'.&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).'</p><p>'.
                   &mt('We apologize for the inconvenience.').'</p>'.
-                  '<a href="/cgi-bin/printout.pl?$identifier">Continue</a>'.$end_page);
+                  '<a href="/cgi-bin/printout.pl?'.$identifier.'">Continue</a>'.$end_page);
     } else {
 	$r->print(<<FINALEND);
 <br />
@@ -2273,7 +2277,7 @@ sub print_resources {
 
 		    &Apache::lonxml::remember_problem_counter();    
 
-		    my $rendered = &Apache::loncommon::get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 
 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
@@ -2315,7 +2319,7 @@ sub print_resources {
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
 		    $printed .= $curresline.':';
-		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+		    my $rendered = &get_student_view($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 			my $url = &Apache::lonnet::clutter($res_url);
 			my $annotation = &annotate($url);