--- loncom/homework/chemresponse.pm 2005/05/26 20:59:47 1.55 +++ 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.55 2005/05/26 20:59:47 albertel Exp $ +# $Id: chemresponse.pm,v 1.58 2005/06/27 10:58:40 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -81,6 +81,12 @@ JMESECTION } if ($molecule) { $molecule=''; } + my $insert_answer; + if ($shown_text ne '') { + $insert_answer= + ''; + } + my $body=< @@ -110,11 +116,11 @@ $molecule
JME Editor courtesy of Peter Ertl, Novartis
- +$insert_answer
- +    - +
@@ -132,6 +138,19 @@ CHEMINPUT return $result; } +sub jme_img { + my ($jme,$smile,$width,$options)=@_; + my $id=&Apache::loncommon::get_cgi_id(); + my $result=''.$smile.' + &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; @@ -147,14 +166,9 @@ sub start_organicresponse { $safeeval); my $width=&Apache::lonxml::get_param('width',$parstack, $safeeval); - my $id=&Apache::loncommon::get_cgi_id(); - $result=" - &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"})) { @@ -278,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'}.