--- loncom/homework/chemresponse.pm 2003/05/05 19:27:08 1.3
+++ loncom/homework/chemresponse.pm 2004/07/02 08:15:56 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.3 2003/05/05 19:27:08 albertel Exp $
+# $Id: chemresponse.pm,v 1.35 2004/07/02 08:15:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,14 +32,42 @@ use Apache::lonxml;
use Apache::lonnet;
BEGIN {
- &Apache::lonxml::register('Apache::chemresponse',('chemresponse','chemstructure'));
+ &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
}
-sub seperate_jme_window {
- my ($smile_input,$jme_input,$molecule)=@_;
+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=<<SMILESECTION;
+ smiles = document.applets.JME.smiles();
opener.document.lonhomework.$smile_input.value = smiles;
SMILESECTION
}
@@ -51,18 +79,19 @@ SMILESECTION
JMESECTION
}
+ if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
my $body=<<CHEMPAGE;
<html>
<head>
<title>Molecule Editor</title>
<script language="JavaScript">
function submitSmiles() {
- smiles = document.applets.JME.smiles();
- if (smiles == "") {
+ jmeFile = document.applets.JME.jmeFile();
+ if (jmeFile == "") {
alert("Nothing to submit");
} else {
- $smilesection
$jmesection
+ $smilesection
window.close();
}
}
@@ -73,9 +102,10 @@ function openHelpWindow() {
</head>
<body bgcolor="#ffffff">
<center>
-<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="97%" height="78%">
+<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390">
You have to enable Java and JavaScript on your machine.
-<param name="jme" value="$molecule" />
+$molecule
+<param name="options" value="$options" />
</applet><br />
<font face="arial,helvetica,sans-serif" size=-1><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>
<form>
@@ -89,7 +119,7 @@ You have to enable Java and JavaScript o
</body>
</html>
CHEMPAGE
- $body=&HTML::Entities::encode($body);
+ $body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
my $result=<<CHEMINPUT;
<input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.document.open('text/html','replace');editor.document.writeln('$body')" />
@@ -97,12 +127,13 @@ CHEMINPUT
return $result;
}
-sub start_chemresponse {
+sub start_organicresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
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"})) {
@@ -111,55 +142,73 @@ sub start_chemresponse {
$molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
}
- $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule);
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
- $result .=&Apache::edit::text_arg('Starting Molecule:','molecule',
- $token,40);
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ if ($options !~ /multipart/) { $options.=',multipart'; }
+ $result .='<nobr>'.
+ &Apache::edit::text_arg('Starting Molecule:','molecule',
+ $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);
- $result .='<br />';
+ $molecule,$options);
+ $result .='</nobr><br /><nobr>';
$result .=&Apache::edit::text_arg('Correct Answer:','answer',
$token,40);
$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);
+ $jmeanswer,$options);
+ $result .='</nobr><br />';
+ $result .=&Apache::edit::checked_arg('Options:','options',
+ [ ['autoez','Auto E,Z stereochemistry'],
+ ['multipart','Multipart Structures'],
+ ['nostereo','No stereochemistry'],
+ ['reaction','Is a reaction'],
+ ['number','Able to number atoms'] ],
+ ,$token);
$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');
+ 'answer','jmeanswer',
+ 'options');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
}
-sub end_chemresponse {
+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;
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<br \>\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<br \>\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;
@@ -167,45 +216,85 @@ sub end_chemresponse {
}
} 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;
}
-sub start_chemstructure {
+sub start_organicstructure {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web') {
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
- my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
- $result=<<CHEMOUTPUT;
-<applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">
-<param name="options" value="depict border" />
-<param name="jme" value="$molecule" />
-</applet>
-CHEMOUTPUT
+ my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
+ my $id=&Apache::loncommon::get_cgi_id();
+ $result="<img src='/cgi-bin/convertjme.pl?$id'";
+ if ($options =~ /border/) { $result.= ' border="1"'; }
+ $result.=' />';
+ &Apache::lonnet::appenv(
+ 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule),
+ 'cgi.'.$id.'.PNG' => 1,
+ 'cgi.'.$id.'.WIDTH' => $width );
+ } elsif ($target eq 'tex') {
+ my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);
+ if (!$texwidth) { $texwidth='90'; }
+ my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
+ my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
+ my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+ '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
+ my $id=$filename;
+ &Apache::lonnet::appenv(
+ 'cgi.'.$id.'.JME' => &Apache::lonnet::escape($molecule),
+ 'cgi.'.$id.'.PS' => 1,
+ 'cgi.'.$id.'.WIDTH' => $texwidth );
+ $id=&Apache::lonnet::escape($id);
+ &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
+ if ($options =~ /border/) { $result.= '\fbox{'; }
+ $result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
+ if ($options =~ /border/) { $result.= '} '; }
} elsif ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);
- $result .=&Apache::edit::text_arg('Width:','width',$token,5);
- $result .=&Apache::edit::text_arg('Height:','height',$token,5);
+ $result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5);
+ $result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$token,5);
+ $result .='<nobr>';
$result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
$safeeval);
- $result .=&seperate_jme_window(undef,
- &Apache::edit::html_element_name('molecule'),
- $molecule);
- $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ my $options=&Apache::lonxml::get_param('options',$parstack,
+ $safeeval);
+ if ($options !~ /reaction/) {
+ $options.= ',multipart,number';
+ }
+
+ $result .=&separate_jme_window(undef,
+ &Apache::edit::html_element_name('molecule'),
+ $molecule,$options);
+ $result.="</nobr><br />";
+ $result .=&Apache::edit::checked_arg('Options:','options',
+ [ ['reaction','Is a reaction'],
+ ['border','Draw a border'] ],
+ $token);
+ $result .=&Apache::edit::end_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'molecule',
- 'width','height');
+ 'width','texwidth',
+ 'options');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
}
-sub end_chemstructure {
+sub end_organicstructure {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq "edit") {
@@ -214,5 +303,106 @@ sub end_chemstructure {
return $result;
}
+sub edit_reaction_button {
+ my ($id,$field,$reaction)=@_;
+ my $id_es=&Apache::lonnet::escape($id);
+ my $field_es=&Apache::lonnet::escape($field);
+ my $reaction_es=&Apache::lonnet::escape($reaction);
+ my $result=<<EDITREACTION;
+<script type="text/javascript">
+ function create_reaction_window_${id}_${field} () {
+ editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
+ editor.document.open('text/html','replace');
+ editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0"> <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html" name="viewer" scrolling="no" /> <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
+ }
+</script>
+<input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
+EDITREACTION
+ return $result;
+}
+
+sub start_reactionresponse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ 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"};
+ 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,
+ $safeeval);
+ $result .='<nobr>'.
+ &Apache::edit::text_arg('Answer:','answer',$token,40);
+ $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
+ my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
+ $result.='<nobr>'.
+ &Apache::edit::text_arg('Initial Reation:','initial',$token,40);
+ $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</nobr>';
+
+ $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',
+ 'initial');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
+
+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],$safeeval);
+ my $response = &Apache::response::getresponse();
+ if ( $response =~ /[^\s]/) {
+ my $partid = $Apache::inputtags::part;
+ my $id = $Apache::inputtags::response['-1'];
+ 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;
+ my $ad;
+ foreach my $answer (@answers) {
+ &Apache::lonxml::debug("submitted a $response for $answer<br \>\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;
+}
+
1;
__END__