--- loncom/homework/chemresponse.pm 2005/02/18 05:37:42 1.47
+++ loncom/homework/chemresponse.pm 2005/07/05 10:06:34 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.47 2005/02/18 05:37:42 albertel Exp $
+# $Id: chemresponse.pm,v 1.62 2005/07/05 10:06:34 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,6 +30,7 @@ package Apache::chemresponse;
use strict;
use Apache::lonxml;
use Apache::lonnet;
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
@@ -63,7 +64,7 @@ sub chem_standard_order {
}
sub separate_jme_window {
- my ($smile_input,$jme_input,$molecule,$options)=@_;
+ my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_;
my $smilesection;
if (defined($smile_input)) {
$smilesection=<<SMILESECTION;
@@ -80,12 +81,17 @@ JMESECTION
}
if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
+ my $insert_answer;
+ if ($shown_text eq '') {
+ $insert_answer=
+ '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
+ }
+
my $body=<<CHEMPAGE;
<html>
<head>
<title>Molecule Editor</title>
<script type="text/javascript">
-// <!--
function submitSmiles() {
jmeFile = document.applets.JME.jmeFile();
if (jmeFile == "") {
@@ -99,23 +105,45 @@ function submitSmiles() {
function openHelpWindow() {
window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600");
}
-// -->
+function substituent(r) {document.applets.JME.setSubstituent(r);}
</script>
</head>
<body bgcolor="#ffffff">
<center>
-<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390">
+<form>
+ <table width="440"><tr>
+ <td></td>
+ <td align="right">
+ <select onchange="javascript:substituent(options[selectedIndex].text)">
+ <option>Select substituent</option>
+ <option>-C(=O)OH</option>
+ <option>-C(=O)OMe</option>
+ <option>-OC(=O)Me</option>
+ <option>-CMe3</option>
+ <option>-CF3</option>
+ <option>-CCl3</option>
+ <option>-NO2</option>
+ <option>-SO2-NH2</option>
+ <option>-NH-SO2-Me</option>
+ <option>-NMe2</option>
+ <option>-C#N</option>
+ <option>-C#C-Me</option>
+ <option>-C#CH</option>
+ </select>
+ </td></tr>
+ </table>
+<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390" mayscript>
You have to enable Java and JavaScript on your machine.
$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>
-<input type="button" name="submit" value="Insert Answer" onclick = "submitSmiles();" />
+<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>
+<br />
+$insert_answer
<br />
-<input type="button" value=" Close " onclick = "window.close()" />
+<input type="button" value=" Close " onclick = "javascript:window.close()" />
-<input type="button" value=" Help " onclick = "openHelpWindow()" />
+<input type="button" value=" Help " onclick = "javascript:openHelpWindow()" />
</form>
</center>
</body>
@@ -123,13 +151,29 @@ $molecule
CHEMPAGE
$body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
+ my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
+ my $display=&mt('Draw Molecule');
+ if (defined($shown_text)) { $display=&mt($shown_text); }
my $result=<<CHEMINPUT;
-<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')" />
+<input type="button" value="$display" onclick="javascript:editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=no,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
CHEMINPUT
return $result;
}
+sub jme_img {
+ my ($jme,$smile,$width,$options)=@_;
+ my $id=&Apache::loncommon::get_cgi_id();
+ my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';
+ if ($options =~ /border/) { $result.= ' border="1"'; }
+ $result.=' />';
+ &Apache::lonnet::appenv('cgi.'.$id.'.JME' =>
+ &Apache::lonnet::escape($jme),
+ 'cgi.'.$id.'.PNG' => 1,
+ 'cgi.'.$id.'.WIDTH' => $width);
+ return $result;
+}
+
sub start_organicresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -138,21 +182,16 @@ sub start_organicresponse {
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('organicresponse');
} elsif ($target eq 'web') {
- if ( &Apache::response::show_answer() ) {
- my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
- $safeeval);
+ my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
+ $safeeval);
+ if ( &Apache::response::show_answer() && $jmeanswer ne '') {
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);
+ my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+ $safeeval);
+ $result.=&jme_img($jmeanswer,$answers[0],$width,$options);
} else {
my $molecule;
if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
@@ -163,7 +202,12 @@ sub start_organicresponse {
}
my $options=&Apache::lonxml::get_param('options',$parstack,
$safeeval);
- $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
+ my $shown_text;
+ if (&Apache::response::show_answer()) {
+ $shown_text="Show Your Last Answer";
+ }
+ $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
+ $options,$shown_text);
$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
}
} elsif ($target eq 'edit') {
@@ -237,7 +281,7 @@ sub end_organicresponse {
}
&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"};
+ $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"};
}
} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
@@ -271,10 +315,14 @@ sub start_organicstructure {
'cgi.'.$id.'.WIDTH' => $width );
} elsif ($target eq 'tex') {
my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
+ my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);
+ my $webheight=&Apache::lonxml::get_param('height', $parstack, $safeeval);
+ if (!$webheight) { $webheight = $webwidth; }
if (!$texwidth) { $texwidth='90'; }
+ $result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n";
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'}.
+ my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
'_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
my $id=$filename;
&Apache::lonnet::appenv(
@@ -366,8 +414,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);
@@ -438,8 +489,14 @@ sub end_reactionresponse {
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') {
- &Apache::lonxml::startredirection();
+ $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;
}
@@ -447,14 +504,6 @@ sub start_chem {
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;
}