--- loncom/homework/chemresponse.pm 2003/10/18 07:24:35 1.19
+++ loncom/homework/chemresponse.pm 2005/02/17 21:42:37 1.46
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.19 2003/10/18 07:24:35 albertel Exp $
+# $Id: chemresponse.pm,v 1.46 2005/02/17 21:42:37 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',('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)) {
$smilesection=<<SMILESECTION;
+ smiles = document.applets.JME.smiles();
opener.document.lonhomework.$smile_input.value = smiles;
SMILESECTION
}
@@ -58,12 +86,12 @@ JMESECTION
<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();
}
}
@@ -74,7 +102,7 @@ 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.
$molecule
<param name="options" value="$options" />
@@ -91,10 +119,11 @@ $molecule
</body>
</html>
CHEMPAGE
- $body=&HTML::Entities::encode($body);
+ $body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
+ my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
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')" />
+<input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.$docopen;editor.document.writeln('$body')" />
CHEMINPUT
return $result;
}
@@ -105,18 +134,36 @@ 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"})) {
- $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="<img src='/cgi-bin/convertjme.pl?$id'";
+ if ($options =~ /border/) { $result.= ' border="1"'; }
+ $result.=' />';
+ &Apache::lonnet::appenv('cgi.'.$id.'.JME' =>
+ &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.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
}
- my $options=&Apache::lonxml::get_param('options',$parstack,
- $safeeval);
- $result=&seperate_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);
my $options=&Apache::lonxml::get_param('options',$parstack,
@@ -127,7 +174,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 .='</nobr><br /><nobr>';
@@ -136,24 +183,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 .='</nobr><br />';
$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;
@@ -162,8 +211,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;
@@ -181,6 +230,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"};
@@ -207,7 +259,7 @@ sub start_organicstructure {
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
- my $id=time.'_'.int(rand(1000));
+ my $id=&Apache::loncommon::get_cgi_id();
$result="<img src='/cgi-bin/convertjme.pl?$id'";
if ($options =~ /border/) { $result.= ' border="1"'; }
$result.=' />';
@@ -216,7 +268,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);
@@ -229,12 +281,13 @@ sub start_organicstructure {
'cgi.'.$id.'.WIDTH' => $texwidth );
$id=&Apache::lonnet::escape($id);
&Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
- $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
+ 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('TeXwidth:','texwidth',$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,
@@ -245,7 +298,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.="</nobr><br />";
@@ -253,12 +306,12 @@ sub start_organicstructure {
[ ['reaction','Is a reaction'],
['border','Draw a border'] ],
$token);
- $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ $result .=&Apache::edit::end_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'molecule',
- 'width','height',
- 'texwidth','options');
+ 'width','texwidth',
+ 'options');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -278,15 +331,16 @@ 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;
<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>');
+ editor.$docopen;
+ 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?inhibitmenu=yes" name="viewer" scrolling="no" /> <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&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);" />
+<input type='button' value='Edit Answer' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
EDITREACTION
return $result;
}
@@ -296,11 +350,21 @@ 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'];
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,
@@ -308,11 +372,16 @@ sub start_reactionresponse {
$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 Reaction:','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');
+ $safeeval,'answer',
+ 'initial');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -321,8 +390,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;
@@ -333,12 +402,16 @@ sub end_reactionresponse {
my $ad;
foreach my $answer (@answers) {
&Apache::lonxml::debug("submitted a $response for $answer<br \>\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;
}
@@ -358,5 +431,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__