--- loncom/interface/lonprintout.pm 2008/02/26 10:46:14 1.515 +++ loncom/interface/lonprintout.pm 2008/03/10 08:54:19 1.517 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.515 2008/02/26 10:46:14 foxr Exp $ +# $Id: lonprintout.pm,v 1.517 2008/03/10 08:54:19 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,30 +144,15 @@ sub ssi_with_retries { my ($resource, $retries, %form) = @_; - my $ok = 0; # True if we got a good response. - my $content; - my $response; - - # Try to get the ssi done. within the retries count: - - do { - ($content, $response) = &Apache::lonnet::ssi($resource, %form); - $ok = $response->is_success; - $retries--; - } while (!$ok && ($retries > 0)); - - # Two cases: ok is true we have valid data, if not, retries have been exhausted - # if ok is true, $response->content is what we want to return.. otherwise - # set the error information: - - if ($ok) { - return $content; - } else { + my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form); + if (!$response->is_success) { $ssi_error = 1; $ssi_last_error_resource = $resource; - $ssi_last_error = $response->code." ". $response->message; - return ''; # Nothing we can add to the printout that makes sense. + $ssi_last_error = $response->code . " " . $response->message; } + + return $content; + } # @@ -1139,6 +1124,7 @@ sub print_latex_header { '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n". '\usepackage{wrapfig}'. '\usepackage{picins}\usepackage{calc}'."\n". + '\usepackage[utf8]{inputenc}'."\n". '\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".