--- loncom/homework/chemresponse.pm 2004/01/20 20:30:48 1.28
+++ loncom/homework/chemresponse.pm 2005/02/18 05:37:42 1.47
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.28 2004/01/20 20:30:48 albertel Exp $
+# $Id: chemresponse.pm,v 1.47 2005/02/18 05:37:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,10 +32,37 @@ use Apache::lonxml;
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
+ &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
}
-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)) {
@@ -57,7 +84,8 @@ JMESECTION
Molecule Editor
-
@@ -82,20 +111,21 @@ $molecule
JME Editor courtesy of Peter Ertl, Novartis
CHEMPAGE
- $body=&HTML::Entities::encode($body);
+ $body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
+ my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $result=<
+
CHEMINPUT
return $result;
}
@@ -108,17 +138,34 @@ sub start_organicresponse {
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('organicresponse');
} elsif ($target eq 'web') {
- my $molecule;
- if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
- $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
+ if ( &Apache::response::show_answer() ) {
+ my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
+ $safeeval);
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ my $width=&Apache::lonxml::get_param('width',$parstack,
+ $safeeval);
+ my $id=&Apache::loncommon::get_cgi_id();
+ $result="
+ &Apache::lonnet::escape($jmeanswer),
+ 'cgi.'.$id.'.PNG' => 1,
+ 'cgi.'.$id.'.WIDTH' => $width);
} else {
- $molecule=&Apache::lonxml::get_param('molecule',$parstack,
- $safeeval);
+ my $molecule;
+ if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
+ $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
+ } else {
+ $molecule=&Apache::lonxml::get_param('molecule',$parstack,
+ $safeeval);
+ }
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
+ $result.= '';
}
- my $options=&Apache::lonxml::get_param('options',$parstack,
- $safeeval);
- $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
- $result.= '';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
my $options=&Apache::lonxml::get_param('options',$parstack,
@@ -129,7 +176,7 @@ sub start_organicresponse {
$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
- $result .=&seperate_jme_window(undef,
+ $result .=&separate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),
$molecule,$options);
$result .='
';
@@ -138,24 +185,26 @@ sub start_organicresponse {
$result .=&Apache::edit::hidden_arg('jmeanswer',$token);
my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
$safeeval);
- $result .=&seperate_jme_window(
+ $result .=&separate_jme_window(
&Apache::edit::html_element_name('answer'),
&Apache::edit::html_element_name('jmeanswer'),
$jmeanswer,$options);
$result .='
';
$result .=&Apache::edit::checked_arg('Options:','options',
- [ ['autoez','Auto E,Z sterochemistry'],
+ [ ['autoez','Auto E,Z stereochemistry'],
['multipart','Multipart Structures'],
['nostereo','No stereochemistry'],
['reaction','Is a reaction'],
['number','Able to number atoms'] ],
,$token);
+ $result .=&Apache::edit::text_arg('Width of correct answer image:',
+ 'width',$token,10);
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'molecule',
'answer','jmeanswer',
- 'options');
+ 'options','width');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -164,8 +213,8 @@ sub start_organicresponse {
sub end_organicresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
- &Apache::response::setup_params($$tagstack[-1]);
+ if ($target eq 'grade' && &Apache::response::submitted()) {
+ &Apache::response::setup_params($$tagstack[-1],$safeeval);
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
my $partid = $Apache::inputtags::part;
@@ -183,6 +232,9 @@ sub end_organicresponse {
$ad='INCORRECT';
}
}
+ if ($ad && $Apache::lonhomework::type eq 'survey') {
+ $ad='SUBMITTED';
+ }
&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"};
@@ -218,7 +270,7 @@ sub start_organicstructure {
'cgi.'.$id.'.PNG' => 1,
'cgi.'.$id.'.WIDTH' => $width );
} elsif ($target eq 'tex') {
- my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);
+ my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
if (!$texwidth) { $texwidth='90'; }
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
@@ -248,7 +300,7 @@ sub start_organicstructure {
$options.= ',multipart,number';
}
- $result .=&seperate_jme_window(undef,
+ $result .=&separate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),
$molecule,$options);
$result.="
";
@@ -281,15 +333,18 @@ sub edit_reaction_button {
my $id_es=&Apache::lonnet::escape($id);
my $field_es=&Apache::lonnet::escape($field);
my $reaction_es=&Apache::lonnet::escape($reaction);
+ my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
my $result=<
+//
-
+
EDITREACTION
return $result;
}
@@ -304,7 +359,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 +376,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 Reaction:','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;
@@ -325,8 +394,8 @@ sub start_reactionresponse {
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]);
+ if ($target eq 'grade' && &Apache::response::submitted()) {
+ &Apache::response::setup_params($$tagstack[-1],$safeeval);
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
my $partid = $Apache::inputtags::part;
@@ -337,12 +406,16 @@ 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';
}
}
+ if ($ad && $Apache::lonhomework::type eq 'survey') {
+ $ad='SUBMITTED';
+ }
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
}
@@ -362,5 +435,28 @@ sub end_reactionresponse {
return $result;
}
+sub start_chem {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ if ($target eq 'tex' || $target eq 'web') {
+ &Apache::lonxml::startredirection();
+ }
+ return $result;
+}
+
+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;
+}
+
1;
__END__