--- loncom/homework/chemresponse.pm 2005/04/07 06:56:21 1.50
+++ loncom/homework/chemresponse.pm 2005/06/27 10:58:40 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.50 2005/04/07 06:56:21 albertel Exp $
+# $Id: chemresponse.pm,v 1.58 2005/06/27 10:58:40 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=<'; }
+ my $insert_answer;
+ if ($shown_text ne '') {
+ $insert_answer=
+ '';
+ }
+
my $body=<
@@ -109,11 +116,11 @@ $molecule
JME Editor courtesy of Peter Ertl, Novartis
@@ -121,13 +128,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
return $result;
}
+sub jme_img {
+ my ($jme,$smile,$width,$options)=@_;
+ my $id=&Apache::loncommon::get_cgi_id();
+ my $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;
@@ -136,21 +159,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="
';
- &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"})) {
@@ -161,7 +179,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.= '';
}
} elsif ($target eq 'edit') {
@@ -269,7 +292,11 @@ 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'}.
@@ -364,8 +391,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);