From: dpvc v. a. <we...@ma...> - 2010-01-27 12:08:43
|
Log Message: ----------- Allow creation of test points with no errors Modified Files: -------------- pg/lib/Value: Formula.pm Revision Data ------------- Index: Formula.pm =================================================================== RCS file: /webwork/cvs/system/pg/lib/Value/Formula.pm,v retrieving revision 1.65 retrieving revision 1.66 diff -Llib/Value/Formula.pm -Llib/Value/Formula.pm -u -r1.65 -r1.66 --- lib/Value/Formula.pm +++ lib/Value/Formula.pm @@ -308,7 +308,7 @@ # sub createRandomPoints { my $self = shift; my $context = $self->context; - my ($num_points,$include) = @_; my $cacheResults = !defined($num_points); + my ($num_points,$include,$noErrors) = @_; my $cacheResults = !defined($num_points); $num_points = int($self->getFlag('num_points',5)) unless defined($num_points); $num_points = 1 if $num_points < 1; @@ -358,8 +358,9 @@ my $error = "Can't generate enough valid points for comparison"; $error .= ':<div style="margin-left:1em">'.($context->{error}{message} || $@).'</div>' if ($self->getFlag('showTestPointErrors')); - $error =~ s/ (in \S+ )?at line \d+.*//s; - Value::Error($error); + $error =~ s! (in \S+ )?at line \d+.*</div>!</div>!s; + Value::Error($error) unless $noErrors; + return ($points,$values,1); } return ($points,$values) unless $cacheResults; |