--- loncom/homework/chemresponse.pm 2003/09/08 22:08:37 1.12
+++ loncom/homework/chemresponse.pm 2003/10/16 18:30:46 1.15
@@ -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.15 2003/10/16 18:30:46 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,7 +51,7 @@ SMILESECTION
JMESECTION
}
- if ($molecule) { $molecule=""; }
+ if ($molecule) { $molecule=''; }
my $body=<
@@ -113,14 +113,9 @@ sub start_organicresponse {
$molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
}
- my $multipart=&Apache::lonxml::get_param('multipart',$parstack,
- $safeeval);
- if ($multipart eq 'yes') {
- $multipart = 'multipart';
- } else {
- $multipart ='';
- }
- $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$multipart);
+ 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);
@@ -175,15 +170,18 @@ sub end_organicresponse {
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 ($response eq $answer) {
+ $ad='EXACT_ANS';
+ last;
+ } else {
+ $ad='INCORRECT';
+ }
}
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
@@ -191,6 +189,14 @@ sub end_organicresponse {
}
} 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('organicresponse');
+ foreach my $answer (@answers) {
+ $result.=&Apache::response::answer_part('organicresponse',$answer);
+ }
+ $result.=&Apache::response::answer_footer('organicresponse');
}
&Apache::response::end_response;
return $result;
@@ -307,21 +313,32 @@ sub end_reactionresponse {
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 ($response eq $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;