--- loncom/homework/chemresponse.pm	2005/02/22 21:33:27	1.49
+++ loncom/homework/chemresponse.pm	2005/05/26 21:26:25	1.56
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.49 2005/02/22 21:33:27 albertel Exp $
+# $Id: chemresponse.pm,v 1.56 2005/05/26 21:26:25 albertel 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;
@@ -121,13 +122,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('/rat/adm/empty.html','jmeedit','width=500,height=500,menubar=yes,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
+<input type="button" value="$display" onclick="javascript:editor=window.open($nothing,'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;
 }
 
+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;
@@ -136,21 +153,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"})) {
@@ -161,7 +173,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') {
@@ -235,7 +252,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 +289,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(
@@ -364,8 +381,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);