--- loncom/homework/chemresponse.pm	2003/10/06 21:39:51	1.13
+++ loncom/homework/chemresponse.pm	2004/01/20 20:30:48	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.13 2003/10/06 21:39:51 albertel Exp $
+# $Id: chemresponse.pm,v 1.28 2004/01/20 20:30:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ sub seperate_jme_window {
     my $smilesection;
     if (defined($smile_input)) {
 	$smilesection=<<SMILESECTION;
+        smiles = document.applets.JME.smiles();
 	opener.document.lonhomework.$smile_input.value = smiles;
 SMILESECTION
     }
@@ -51,19 +52,19 @@ SMILESECTION
 JMESECTION
     }
 
-    if ($molecule) { $molecule="<param name='jme' value='$molecule' />"; }
+    if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
     my $body=<<CHEMPAGE;
 <html>
 <head>
 <title>Molecule Editor</title>
 <script language="JavaScript">
 function submitSmiles() {
-    smiles = document.applets.JME.smiles();
-    if (smiles == "") {
+    jmeFile = document.applets.JME.jmeFile();
+    if (jmeFile == "") {
 	alert("Nothing to submit");
     } else {
-        $smilesection
         $jmesection
+        $smilesection
 	window.close();
     }
 }
@@ -74,7 +75,7 @@ function openHelpWindow() {
 </head>
 <body bgcolor="#ffffff">
 <center>
-<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="97%" height="78%">
+<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390">
 You have to enable Java and JavaScript on your machine.
 $molecule
 <param name="options" value="$options" />
@@ -105,6 +106,7 @@ sub start_organicresponse {
     my $partid = $Apache::inputtags::part;
     my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('organicresponse');
     } elsif ($target eq 'web') {
 	my $molecule;
 	if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
@@ -113,14 +115,9 @@ sub start_organicresponse {
 	    $molecule=&Apache::lonxml::get_param('molecule',$parstack,
 						 $safeeval);
 	}
-	my $multipart=&Apache::lonxml::get_param('multipart',$parstack,
-						 $safeeval);
-	if ($multipart eq 'yes') {
-	    $multipart = 'multipart';
-	} else {
-	    $multipart ='';
-        }
-	$result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$multipart);
+	my $options=&Apache::lonxml::get_param('options',$parstack,
+					       $safeeval);
+	$result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
 	$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
@@ -148,12 +145,10 @@ sub start_organicresponse {
 	$result .='</nobr><br />';
 	$result .=&Apache::edit::checked_arg('Options:','options',
 				    [ ['autoez','Auto E,Z sterochemistry'],
-				      ['multipart','MultiPart Structures'],
-				      ['hydrogens','Show Hydrogens'],
+				      ['multipart','Multipart Structures'],
 				      ['nostereo','No stereochemistry'],
 				      ['reaction','Is a reaction'],
-				      ['number','Able to number atoms'],
-				      ['border','Draw a border'] ],
+				      ['number','Able to number atoms'] ],
 					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -194,6 +189,14 @@ sub end_organicresponse {
 	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
+    } elsif ($target eq 'answer') {
+	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+						     $safeeval);
+	$result.=&Apache::response::answer_header('organicresponse');
+	foreach my $answer (@answers) {
+	    $result.=&Apache::response::answer_part('organicresponse',$answer);
+	}
+	$result.=&Apache::response::answer_footer('organicresponse');
     }
     &Apache::response::end_response;
     return $result;
@@ -204,19 +207,37 @@ sub start_organicstructure {
     my $result;
     if ($target eq 'web') {
 	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
-	my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
 	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
 	my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
-	$result=<<CHEMOUTPUT;
-<applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">
-<param name="options" value="depict,$options" />
-<param name="jme" value="$molecule" />
-</applet>
-CHEMOUTPUT
+	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($molecule),
+	    'cgi.'.$id.'.PNG' => 1,
+	    'cgi.'.$id.'.WIDTH' => $width );
+    } elsif ($target eq 'tex') {
+	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);
+	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'}.
+	    '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
+	my $id=$filename;
+	&Apache::lonnet::appenv(
+		     'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),
+		     'cgi.'.$id.'.PS' => 1,
+		     'cgi.'.$id.'.WIDTH' => $texwidth );
+	$id=&Apache::lonnet::escape($id);
+	&Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
+	if ($options =~ /border/) { $result.= '\fbox{'; }
+	$result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
+	if ($options =~ /border/) { $result.= '} '; }
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
-	$result .=&Apache::edit::text_arg('Width:','width',$token,5);
-	$result .=&Apache::edit::text_arg('Height:','height',$token,5);
+	$result .=&Apache::edit::text_arg('Width (pixels):','width',$token,5);
+	$result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$token,5);
 	$result .='<nobr>';
 	$result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
 	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
@@ -232,15 +253,14 @@ CHEMOUTPUT
 				       $molecule,$options);
 	$result.="</nobr><br />";
 	$result .=&Apache::edit::checked_arg('Options:','options',
-					     [ ['hydrogens','Show Hydrogens'],
-					       ['reaction','Is a reaction'],
+					     [ ['reaction','Is a reaction'],
 					       ['border','Draw a border'] ],
 					     $token);
-	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+	$result .=&Apache::edit::end_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						     $safeeval,'molecule',
-						     'width','height',
+						     'width','texwidth',
 						     'options');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
@@ -279,6 +299,7 @@ sub start_reactionresponse {
     my $result;
     my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('reactionresponse');
     } elsif ($target eq 'web') {
 	my $partid = $Apache::inputtags::part;
 	my $id = $Apache::inputtags::response['-1'];
@@ -310,7 +331,7 @@ sub end_reactionresponse {
 	if ( $response =~ /[^\s]/) {
 	    my $partid = $Apache::inputtags::part;
 	    my $id = $Apache::inputtags::response['-1'];
-	    my (@answers)=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+	    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 	    my %previous = &Apache::response::check_for_previous($response,$partid,$id);
 	    $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
 	    my $ad;
@@ -327,6 +348,15 @@ sub end_reactionresponse {
 	}
     }  elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
+    } elsif ($target eq 'answer') {
+	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+						     $safeeval);
+	$result.=&Apache::response::answer_header('reactionresponse');
+	foreach my $answer (@answers) {
+	    $result.=&Apache::response::answer_part('reactionresponse',
+						    $answer);
+	}
+	$result.=&Apache::response::answer_footer('reactionresponse');
     }
     &Apache::response::end_response;
     return $result;
