--- trunk/webwork2/lib/WeBWorK/PG.pm	2002/10/28 21:21:26	612
+++ trunk/webwork2/lib/WeBWorK/PG.pm	2003/01/07 21:19:38	692
@@ -44,10 +44,8 @@
 	
 	# install a local warn handler to collect warnings
 	my $warnings = "";
-	if ($courseEnv->{pg}->{options}->{catchWarnings}) {
-		warn "PG: about to install a warnings handler...\n"; # ***
-		local $SIG{__WARN__} = sub { $warnings .= shift };
-	}
+	local $SIG{__WARN__} = sub { $warnings .= shift }
+		if $courseEnv->{pg}->{options}->{catchWarnings};
 	
 	# create a Translator
 	#warn "PG: creating a Translator\n";
@@ -142,6 +140,11 @@
 	#warn "PG: installing a safety filter\n";
 	$translator->rf_safety_filter(\&safetyFilter);
 	
+	# write timing log entry -- the translator is now all set up
+	writeTimingLogEntry($courseEnv, "WeBWorK::PG::new",
+		"initialized",
+		"intermediate");
+	
 	# translate the PG source into text
 	#warn "PG: translating the PG source into text\n";
 	$translator->translate();
@@ -253,8 +256,8 @@
 	$envir{displayMode}       = translateDisplayModeNames($options->{displayMode});
 	$envir{languageMode}      = $envir{displayMode};	 
 	$envir{outputMode}        = $envir{displayMode};	 
-	$envir{displayHintsQ}     = $options->{hints};	 
-	$envir{displaySolutionsQ} = $options->{solutions};
+	$envir{displayHintsQ}     = $options->{showHints};	 
+	$envir{displaySolutionsQ} = $options->{showSolutions};
 	$envir{refreshMath2img}   = $options->{refreshMath2img};
 	$envir{texDisposition}    = "pdf"; # in webwork-modperl, we use pdflatex
 	
@@ -320,6 +323,11 @@
 		? tempdir("webwork-dvipng-XXXXXXXX", DIR => $envir{tempDirectory})
 		: undef;
 	
+	# Information for sending mail
+	
+	$envir{mailSmtpServer} = $courseEnv->{mail}->{smtpServer};
+	$envir{mailSmtpSender} = $courseEnv->{mail}->{smtpSender};
+	
 	# Default values for evaluating answers
 	
 	my $ansEvalDefaults = $courseEnv->{pg}->{ansEvalDefaults};
@@ -356,7 +364,7 @@
 	}
 	# replace ^ with **    (for exponentiation)
 	# $answer =~ s/\^/**/g;
-	# Return if  forbidden characters are found
+	# Return if forbidden characters are found
 	unless ($answer =~ /^[a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)]+$/ )  {
 		$answer =~ tr/a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)/#/c;
 		$errorno = "<BR>There are forbidden characters in your answer: $submittedAnswer<BR>";