LON-CAPA Reaction Editor

--- loncom/homework/chemresponse.pm 2004/03/12 18:41:43 1.31 +++ loncom/homework/chemresponse.pm 2004/07/15 18:53:11 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.31 2004/03/12 18:41:43 albertel Exp $ +# $Id: chemresponse.pm,v 1.36 2004/07/15 18:53:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,33 @@ BEGIN { &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse')); } +sub chem_standard_order { + my ($reaction) = @_; + my ($re,$pr) = split(/->|<=>/,$reaction); + my @reactants = split(/\s\+/,$re); + my @products = split(/\s\+/,$pr); + foreach my $substance (@reactants,@products) { + $substance =~ s/(\^\d*)\s+/$1_/g; # protect superscript space + $substance =~ s/\s*//g; # strip whitespace + $substance =~ s/_/ /g; # restore superscript space + } + @reactants = sort @reactants; + @products = sort @products; + my $standard = ''; + foreach my $substance (@reactants) { + $standard .= $substance; + $standard .= ' + '; + } + $standard =~ s/ \+ $//; # get rid of trailing plus sign + $standard .= ' -> '; + foreach my $substance (@products) { + $standard .= $substance; + $standard .= ' + '; + } + $standard =~ s/ \+ $//; # get rid of trailing plus sign + return $standard; +} + sub separate_jme_window { my ($smile_input,$jme_input,$molecule,$options)=@_; my $smilesection; @@ -92,7 +119,7 @@ $molecule CHEMPAGE - $body=&HTML::Entities::encode($body); + $body=&HTML::Entities::encode($body,'<>&"'); $body=~s/\n/ /g; my $result=< @@ -289,7 +316,7 @@ sub edit_reaction_button { editor.document.writeln(' LON-CAPA Reaction Editor '); } - + EDITREACTION return $result; } @@ -304,7 +331,16 @@ sub start_reactionresponse { my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"}; - $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); + if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); } + my $status=$Apache::inputtags::status['-1']; + if ($status eq 'CAN_ANSWER') { + $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); + } + 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); + } } elsif ($target eq "edit") { $result .=&Apache::edit::tag_start($target,$token); my $answer=&Apache::lonxml::get_param('answer',$parstack, @@ -312,11 +348,16 @@ sub start_reactionresponse { $result .=''. &Apache::edit::text_arg('Answer:','answer',$token,40); $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).''; + my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval); + $result.=''. + &Apache::edit::text_arg('Initial Reation:','initial',$token,40); + $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).''; $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'answer'); + $safeeval,'answer', + 'initial'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } return $result; @@ -337,7 +378,8 @@ sub end_reactionresponse { my $ad; foreach my $answer (@answers) { &Apache::lonxml::debug("submitted a $response for $answer
\n"); - if ($response eq $answer) { + if (&chem_standard_order($response) eq + &chem_standard_order($answer)) { $ad='EXACT_ANS'; } else { $ad='INCORRECT';