[LON-CAPA-cvs] cvs: loncom /xml lontexconvert.pm

[albertel]

albertel		Tue May 25 02:11:49 2004 EDT

  Modified files:              
    /loncom/xml	lontexconvert.pm 
  Log:
  - if there are any errors at all when doing tth kill the apache child
    - BUG#3030
  
  
Index: loncom/xml/lontexconvert.pm
diff -u loncom/xml/lontexconvert.pm:1.36 loncom/xml/lontexconvert.pm:1.37
--- loncom/xml/lontexconvert.pm:1.36	Fri Mar 19 12:54:17 2004
+++ loncom/xml/lontexconvert.pm	Tue May 25 02:11:49 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.36 2004/03/19 17:54:17 albertel Exp $
+# $Id: lontexconvert.pm,v 1.37 2004/05/25 06:11:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -95,6 +95,7 @@
     my ($xmlstring,$errorstring);
     local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; };
     local $SIG{ALRM}=sub { 
+	&Apache::lonnet::logthis("ALRM");
 	$xmlstring='['.&mt("TeX unconverted due to errors").']';
 	$Apache::lontexconvert::messedup=1;
 	die &mt("TeX unconverted due to errors");
@@ -130,7 +131,8 @@
 	$errorstring.=&mt("Evaluation Error: ").$@;
 	$Apache::lontexconvert::messedup=1;
     }
-    if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) {
+    if ($Apache::lontexconvert::messedup || &tth::tthmessedup() || 
+	$errorstring) {
 	&Apache::lonnet::logthis("Trying to kill myself");
 	$Apache::lontexconvert::messedup=1;
 	my $request=Apache->request();