--- loncom/homework/chemresponse.pm 2005/02/18 05:37:42 1.47 +++ loncom/homework/chemresponse.pm 2005/05/25 14:33:00 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.47 2005/02/18 05:37:42 albertel Exp $ +# $Id: chemresponse.pm,v 1.52 2005/05/25 14:33:00 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,7 +85,6 @@ JMESECTION Molecule Editor @@ -109,7 +107,7 @@ You have to enable Java and JavaScript o $molecule
-JME Editor courtesy of Peter Ertl, Novartis +JME Editor courtesy of Peter Ertl, Novartis

@@ -125,7 +123,7 @@ CHEMPAGE $body=~s/\n/ /g; my $docopen=&Apache::lonhtmlcommon::javascript_docopen(); my $result=< + CHEMINPUT return $result; } @@ -237,7 +235,7 @@ sub end_organicresponse { } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; - $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"}; + $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"}; } } elsif ($target eq "edit") { $result.= &Apache::edit::tag_end($target,$token,''); @@ -274,7 +272,7 @@ sub start_organicstructure { if (!$texwidth) { $texwidth='90'; } my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval); my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval); - my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}. + my $filename = $env{'user.name'}.'_'.$env{'user.domain'}. '_'.time.'_'.$$.int(rand(1000)).'_organicstructure'; my $id=$filename; &Apache::lonnet::appenv( @@ -366,8 +364,11 @@ sub start_reactionresponse { } if ( &Apache::response::show_answer() ) { my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval); - $ans=~s/(\\|\')/\\$1/g; - $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse('$ans');",$safeeval); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval); } } elsif ($target eq "edit") { $result .=&Apache::edit::tag_start($target,$token); @@ -438,8 +439,14 @@ sub end_reactionresponse { sub start_chem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $result = ''; + my $inside = &Apache::lonxml::get_all_text_unbalanced("/chem",$parser); if ($target eq 'tex' || $target eq 'web') { - &Apache::lonxml::startredirection(); + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + $result=&Apache::run::run("return &chemparse(q\0$inside\0);",$safeeval); } return $result; } @@ -447,14 +454,6 @@ sub start_chem { sub end_chem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $result = ''; - if ($target eq 'tex' || $target eq 'web') { - @Apache::scripttag::parser_env = @_; - if (!$Apache::lonxml::default_homework_loaded) { - &Apache::lonxml::default_homework_load($safeeval); - } - my $innards=&Apache::lonxml::endredirection(); - $result=&Apache::run::run("return &chemparse(q\0$innards\0);",$safeeval); - } return $result; }