--- loncom/homework/chemresponse.pm 2005/01/08 03:54:32 1.43
+++ loncom/homework/chemresponse.pm 2005/04/22 14:10:47 1.51
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.43 2005/01/08 03:54:32 albertel Exp $
+# $Id: chemresponse.pm,v 1.51 2005/04/22 14:10:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,7 +32,7 @@ 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 chem_standard_order {
@@ -84,7 +84,7 @@ JMESECTION
Molecule Editor
-
-
+
EDITREACTION
return $result;
}
@@ -343,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);
@@ -371,7 +395,7 @@ sub start_reactionresponse {
sub end_reactionresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
+ if ($target eq 'grade' && &Apache::response::submitted()) {
&Apache::response::setup_params($$tagstack[-1],$safeeval);
my $response = &Apache::response::getresponse();
if ( $response =~ /[^\s]/) {
@@ -412,5 +436,26 @@ sub end_reactionresponse {
return $result;
}
+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') {
+ $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;
+}
+
+sub end_chem {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ return $result;
+}
+
1;
__END__