Diff for /loncom/interface/lonprintout.pm between versions 1.521 and 1.524

version 1.521, 2008/03/17 09:53:36 version 1.524, 2008/03/28 14:52:52
Line 116  sub annotate { Line 116  sub annotate {
 #                      the number of times requested by the caller.  #                      the number of times requested by the caller.
 #                      If we still have a proble, no text is appended to the  #                      If we still have a proble, no text is appended to the
 #                      output and we set some global variables.  #                      output and we set some global variables.
 #                      to indicate to the caller an SSI error occured.    #                      to indicate to the caller an SSI error occurred.  
 #                      All of this is supposed to deal with the issues described  #                      All of this is supposed to deal with the issues described
 #                      in LonCAPA BZ 5631 see:  #                      in LonCAPA BZ 5631 see:
 #                      http://bugs.lon-capa.org/show_bug.cgi?id=5631  #                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
Line 132  sub annotate { Line 132  sub annotate {
 #   On success, returns the rendered resource identified by the resource parameter.  #   On success, returns the rendered resource identified by the resource parameter.
 # Side Effects:  # Side Effects:
 #   The following global variables can be set:  #   The following global variables can be set:
 #    ssi_error                - If an unrecoverable error occured this becomes true.  #    ssi_error                - If an unrecoverable error occurred this becomes true.
 #                               It is up to the caller to initialize this to false  #                               It is up to the caller to initialize this to false
 #                               if desired.  #                               if desired.
 #    ssi_last_error_resource  - If an unrecoverable error occured, this is the value  #    ssi_last_error_resource  - If an unrecoverable error occurred, this is the value
 #                               of the resource that could not be rendered by the ssi  #                               of the resource that could not be rendered by the ssi
 #                               call.  #                               call.
 #    ssi_last_error           - The error string fetched from the ssi response  #    ssi_last_error           - The error string fetched from the ssi response
Line 158  sub ssi_with_retries { Line 158  sub ssi_with_retries {
   
 }  }
   
   sub get_student_view_with_retries {
       my ($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv)=@_;
   
       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          = $response->code . " " . $response->message;
   
           &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error");
       }
   
       return $content;
   
   }
   
 #  #
 #   printf_style_subst  item format_string repl  #   printf_style_subst  item format_string repl
 #    #  
Line 2092  ENDPART Line 2108  ENDPART
     #      #
   
     if ($ssi_error) {      if ($ssi_error) {
   
           my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
  my $end_page = &Apache::loncommon::end_page();   my $end_page = &Apache::loncommon::end_page();
  $r->print(<<ERROR_END);   $r->print('
 <br />  
 <h2>An unrecoverable error occured:</h2>  
 <p>  
   I was not able to render one of the print resources ($ssi_last_error_resource)   
 due to an unrecoverable error communicating with a server:  
 <br />  <br />
 $ssi_last_error;  <h2>'.&mt('An unrecoverable network error occurred:').'</h2>
 <br />  
 </p>  
 <p>  <p>
 I recommend that you try printing again later as this may mean the server was just     '.&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).' 
 temporarily unavailable, or is down for maintenance.  If this error persists, then  
 please contact your LonCAPA support folks for assistance and diagnosis.   
 <br />  <br />
 <br />  '.$ssi_last_error.'
 We apologize for the inconvenience.  
 </p>  </p>
 $end_page  <p>'.
 ERROR_END  &mt('It is recommended that you try printing again later, as this error may mean the server was just temporarily unavailable, or is down for maintenance.').'<br />'.
   &mt('If the error persists, please contact the [_1] for assistance.',$helpurl).
   '</p><p>'.
   &mt('We apologize for the inconvenience.').
   '</p>'.
   $end_page);
     } else {      } else {
   
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
Line 2274  sub print_resources { Line 2287  sub print_resources {
   
     &Apache::lonxml::remember_problem_counter();          &Apache::lonxml::remember_problem_counter();    
   
     my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);      my $rendered = &Apache::loncommon::get_student_view_with_retries($curresline,3,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
   
     if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||      if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
        ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {         ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {

Removed from v.1.521  
changed lines
  Added in v.1.524


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>