--- loncom/imspackages/imsprocessor.pm 2005/07/12 16:05:59 1.22 +++ loncom/imspackages/imsprocessor.pm 2005/07/13 17:42:53 1.23 @@ -3256,6 +3256,11 @@ sub write_webct4_questions { |; foreach my $numid (@{$$settings{$id}{numids}}) { my $formula = $$settings{$id}{$numid}{formula}; + $formula =~ s/ln/\&log/g; + $formula =~ s/sqrt/\&sqrt/g; + $formula =~ s/sin/\&sin/g; + $formula =~ s/cos/\&cos/g; + $formula =~ s/exp/\&exp/g; foreach my $var (keys %{$$settings{$id}{$numid}{vars}}) { my $decnum = $$settings{$id}{$numid}{vars}{$var}{dec}; my $increment = '0.'; @@ -3269,9 +3274,7 @@ sub write_webct4_questions { } $increment .= '1'; } - $formula =~ s/{($var)}/\$$1/g; - $formula =~ s/ln\(?([^\)])\)?/ &log($1) /g; - $formula =~ s/sqrt/\&sqrt/g; + $formula =~ s/{($var)}/(\$$1)/g; $scriptblock .= qq| \$$var=&random($$settings{$id}{$numid}{vars}{$var}{min},$$settings{$id}{$numid}{vars}{$var}{max},$increment); |;