--- loncom/homework/chemresponse.pm 2003/12/10 19:38:01 1.27
+++ loncom/homework/chemresponse.pm 2004/03/12 18:41:43 1.31
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.27 2003/12/10 19:38:01 albertel Exp $
+# $Id: chemresponse.pm,v 1.31 2004/03/12 18:41:43 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,7 +35,7 @@ BEGIN {
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
}
-sub seperate_jme_window {
+sub separate_jme_window {
my ($smile_input,$jme_input,$molecule,$options)=@_;
my $smilesection;
if (defined($smile_input)) {
@@ -106,6 +106,7 @@ sub start_organicresponse {
my $partid = $Apache::inputtags::part;
my $id = &Apache::response::start_response($parstack,$safeeval);
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"})) {
@@ -116,7 +117,7 @@ sub start_organicresponse {
}
my $options=&Apache::lonxml::get_param('options',$parstack,
$safeeval);
- $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
+ $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
$result.= '';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
@@ -128,7 +129,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 .='
';
@@ -137,13 +138,13 @@ 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'],
@@ -164,7 +165,7 @@ 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]);
+ &Apache::response::setup_params($$tagstack[-1],$safeeval);
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
my $partid = $Apache::inputtags::part;
@@ -247,7 +248,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.="
";
@@ -298,6 +299,7 @@ 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'];
@@ -324,7 +326,7 @@ 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;