--- loncom/xml/lontexconvert.pm 2006/01/27 23:55:15 1.69 +++ loncom/xml/lontexconvert.pm 2006/03/24 18:09:23 1.70 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.69 2006/01/27 23:55:15 albertel Exp $ +# $Id: lontexconvert.pm,v 1.70 2006/03/24 18:09:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -70,17 +70,6 @@ sub init_tth { } } -sub header { - $errorstring=''; - my $time=time; - &init_tth(); - return &Apache::lonxml::xmlbegin(). - "\n\n". - &Apache::lonxml::fontsettings(). - &Apache::lonmenu::registerurl(undef,'tex'). - "\n\n"; -} - # ================================================================== Conversion $Apache::lontexconvert::messedup=0; @@ -137,7 +126,20 @@ ENDCONV $errorstring) { &Apache::lonnet::logthis("Trying to kill myself"); $Apache::lontexconvert::messedup=1; - $Apache::lonxml::request->child_terminate(); + if (ref($Apache::lonxml::request)) { + $Apache::lonxml::request->child_terminate(); + } else { + my $request; + eval { $request=Apache->request; }; + if (!$request) { + eval { $request=Apache2::RequestUtil->request; }; + } + if ($request) { + $request->child_terminate(); + } else { + &Apache::lonnet::logthis("Unable to find a request to do child_terminate on"); + } + } } return $xmlstring; } @@ -217,20 +219,6 @@ sub converted { return &tth_converted($string); } -# ====================================================================== Footer - -sub footer { - my $xmlstring=''; - if ($env{'request.state'} eq 'construct') { - $xmlstring.='
'.$errorstring.'
'; - } else { - &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring); - } -# -------------------------------------------------------------------- End Body - $xmlstring.=&Apache::lonxml::xmlend(); - return $xmlstring; -} - # ------------------------------------------------------------ Message display sub to_convert {