--- loncom/homework/chemresponse.pm 2003/09/08 22:08:37 1.12
+++ loncom/homework/chemresponse.pm 2004/08/12 04:33:22 1.38
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.12 2003/09/08 22:08:37 albertel Exp $
+# $Id: chemresponse.pm,v 1.38 2004/08/12 04:33:22 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,11 +35,39 @@ BEGIN {
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
}
-sub seperate_jme_window {
+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;
if (defined($smile_input)) {
$smilesection=<"; }
+ if ($molecule) { $molecule=''; }
my $body=<
Molecule Editor
-
+
EDITREACTION
return $result;
}
@@ -276,11 +326,21 @@ sub start_reactionresponse {
my $result;
my $id = &Apache::response::start_response($parstack,$safeeval);
if ($target eq 'meta') {
+ $result=&Apache::response::meta_package_write('reactionresponse');
} elsif ($target eq 'web') {
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,
@@ -288,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;
@@ -302,26 +367,38 @@ sub end_reactionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
- &Apache::response::setup_params($$tagstack[-1]);
+ &Apache::response::setup_params($$tagstack[-1],$safeeval);
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
my $partid = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
- my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
my %previous = &Apache::response::check_for_previous($response,$partid,$id);
$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
- &Apache::lonxml::debug("submitted a $response for $answer
\n");
my $ad;
- if ($response eq $answer) {
- $ad='EXACT_ANS';
- } else {
- $ad='INCORRECT';
+ foreach my $answer (@answers) {
+ &Apache::lonxml::debug("submitted a $response for $answer
\n");
+ if (&chem_standard_order($response) eq
+ &chem_standard_order($answer)) {
+ $ad='EXACT_ANS';
+ } else {
+ $ad='INCORRECT';
+ }
}
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
}
} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
+ } elsif ($target eq 'answer') {
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+ $safeeval);
+ $result.=&Apache::response::answer_header('reactionresponse');
+ foreach my $answer (@answers) {
+ $result.=&Apache::response::answer_part('reactionresponse',
+ $answer);
+ }
+ $result.=&Apache::response::answer_footer('reactionresponse');
}
&Apache::response::end_response;
return $result;