--- loncom/homework/chemresponse.pm 2005/01/21 22:10:59 1.44
+++ loncom/homework/chemresponse.pm 2005/05/25 14:33:00 1.52
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.44 2005/01/21 22:10:59 albertel Exp $
+# $Id: chemresponse.pm,v 1.52 2005/05/25 14:33:00 www 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
<html>
<head>
<title>Molecule Editor</title>
-<script language="JavaScript">
+<script type="text/javascript">
function submitSmiles() {
jmeFile = document.applets.JME.jmeFile();
if (jmeFile == "") {
@@ -107,13 +107,13 @@ You have to enable Java and JavaScript o
$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>
+<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();" />
+<input type="button" name="submit" value="Insert Answer" onclick = "submitSmiles();" />
<br />
-<input type="button" value=" Close " onClick = "window.close()" />
+<input type="button" value=" Close " onclick = "window.close()" />
-<input type="button" value=" Help " onClick = "openHelpWindow()" />
+<input type="button" value=" Help " onclick = "openHelpWindow()" />
</form>
</center>
</body>
@@ -123,7 +123,7 @@ CHEMPAGE
$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.$docopen;editor.document.writeln('$body')" />
+<input type="button" value="Draw Molecule" onclick="javascript:editor=window.open('/adm/rat/empty.html','jmeedit','width=500,height=500,menubar=yes,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
CHEMINPUT
return $result;
}
@@ -211,7 +211,7 @@ sub start_organicresponse {
sub end_organicresponse {
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]/) {
@@ -235,7 +235,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,'');
@@ -272,7 +272,7 @@ sub start_organicstructure {
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'}.
+ my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
'_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
my $id=$filename;
&Apache::lonnet::appenv(
@@ -334,13 +334,15 @@ sub edit_reaction_button {
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.$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 Answer' 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;
}
@@ -362,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);
@@ -390,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]/) {
@@ -431,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__