--- trunk/webwork-modperl/lib/WeBWorK/PG.pm	2003/05/28 00:24:27	919
+++ trunk/webwork-modperl/lib/WeBWorK/PG.pm	2003/06/09 17:59:16	1081
@@ -102,7 +102,9 @@
 	
 	# store the problem source
 	#warn "PG: storing the problem source\n";
-	my $sourceFile = $problem->source_file;
+	my $sourceFile = ( defined($translationOptions->{override_problem_source}) ) ?
+						$translationOptions->{override_problem_source} :
+						$problem->source_file;
 	$sourceFile = $courseEnv->{courseDirs}->{templates}."/".$sourceFile
 		unless ($sourceFile =~ /^\//);
 	eval { $translator->source_string(readFile($sourceFile)) };
@@ -240,7 +242,7 @@
 	$envir{questionNumber}    = $envir{probNum};		 
 	$envir{fileName}          = $problem->source_file;	 
 	$envir{probFileName}      = $envir{fileName};		 
-	$envir{problemSeed}       = $problem->problem_seed;	 
+	$envir{problemSeed}       = (defined($options->{override_seed}) ) ? $options->{override_seed} :$problem->problem_seed;	 
 	$envir{displayMode}       = translateDisplayModeNames($options->{displayMode});
 	$envir{languageMode}      = $envir{displayMode};	 
 	$envir{outputMode}        = $envir{displayMode};	 
@@ -355,7 +357,7 @@
 	# replace ^ with **    (for exponentiation)
 	# $answer =~ s/\^/**/g;
 	# Return if forbidden characters are found
-	unless ($answer =~ /^[a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)]+$/ )  {
+	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>";
 		return ($answer,$errorno);