--- loncom/homework/chemresponse.pm	2003/07/01 21:10:43	1.11
+++ loncom/homework/chemresponse.pm	2003/12/01 22:55:52	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.11 2003/07/01 21:10:43 albertel Exp $
+# $Id: chemresponse.pm,v 1.25 2003/12/01 22:55:52 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,18 +52,19 @@ SMILESECTION
 JMESECTION
     }
 
+    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();
     }
 }
@@ -73,9 +75,9 @@ 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="485" height="468">
 You have to enable Java and JavaScript on your machine.
-<param name="jme" value="$molecule" />
+$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>
@@ -112,17 +114,15 @@ 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);
+	my $options=&Apache::lonxml::get_param('options',$parstack,
+					       $safeeval);
+	if ($options !~ /multipart/) { $options.=',multipart'; }
 	$result .='<nobr>'.
 	    &Apache::edit::text_arg('Starting Molecule:','molecule',
 				    $token,40);
@@ -130,7 +130,7 @@ sub start_organicresponse {
 						$safeeval);
 	$result .=&seperate_jme_window(undef,
 		      &Apache::edit::html_element_name('molecule'),
-		      $molecule,'multipart');
+		      $molecule,$options);
 	$result .='</nobr><br /><nobr>';
 	$result .=&Apache::edit::text_arg('Correct Answer:','answer',
 					  $token,40);
@@ -140,16 +140,21 @@ sub start_organicresponse {
 	$result .=&seperate_jme_window(
                       &Apache::edit::html_element_name('answer'),
                       &Apache::edit::html_element_name('jmeanswer'),
-		      $jmeanswer,'multipart');
-	$result .='</nobr>'.
-	    &Apache::edit::select_arg('Multipart:','multipart',
-				      ['no','yes'],$token);
+		      $jmeanswer,$options);
+	$result .='</nobr><br />';
+	$result .=&Apache::edit::checked_arg('Options:','options',
+				    [ ['autoez','Auto E,Z sterochemistry'],
+				      ['multipart','Multipart Structures'],
+				      ['nostereo','No stereochemistry'],
+				      ['reaction','Is a reaction'],
+				      ['number','Able to number atoms'] ],
+					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						     $safeeval,'molecule',
 						     'answer','jmeanswer',
-						     'multipart');
+						     'options');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
     return $result;
@@ -164,15 +169,18 @@ sub end_organicresponse {
 	if ( $response =~ /[^\s]/) {
 	    my $partid = $Apache::inputtags::part;
 	    my $id = $Apache::inputtags::response['-1'];
-	    my $answer=&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;
-	    &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
 	    my $ad;
-	    if ($response eq $answer) {
-		$ad='EXACT_ANS';
-	    } else {
-		$ad='INCORRECT';
+	    foreach my $answer (@answers) {
+		&Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
+		if ($response eq $answer) {
+		    $ad='EXACT_ANS';
+		    last;
+		} else {
+		    $ad='INCORRECT';
+		}
 	    }
 	    &Apache::response::handle_previous(\%previous,$ad);
 	    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
@@ -180,6 +188,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;
@@ -190,29 +206,61 @@ 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);
-	$result=<<CHEMOUTPUT;
-<applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">
-<param name="options" value="depict border" />
-<param name="jme" value="$molecule" />
-</applet>
-CHEMOUTPUT
+	my $options=&Apache::lonxml::get_param('options',$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($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,
 						$safeeval);
+	my $options=&Apache::lonxml::get_param('options',$parstack,
+					       $safeeval);
+	if ($options !~ /reaction/) {
+	    $options.= ',multipart,number';
+	}
+						   
 	$result .=&seperate_jme_window(undef,
-		      &Apache::edit::html_element_name('molecule'),
-		      $molecule,'multipart');
-	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+				 &Apache::edit::html_element_name('molecule'),
+				       $molecule,$options);
+	$result.="</nobr><br />";
+	$result .=&Apache::edit::checked_arg('Options:','options',
+					     [ ['reaction','Is a reaction'],
+					       ['border','Draw a border'] ],
+					     $token);
+	$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); }
     }
     return $result;
@@ -281,21 +329,32 @@ sub end_reactionresponse {
 	if ( $response =~ /[^\s]/) {
 	    my $partid = $Apache::inputtags::part;
 	    my $id = $Apache::inputtags::response['-1'];
-	    my $answer=&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;
-	    &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
 	    my $ad;
-	    if ($response eq $answer) {
-		$ad='EXACT_ANS';
-	    } else {
-		$ad='INCORRECT';
+	    foreach my $answer (@answers) {
+		&Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
+		if ($response eq $answer) {
+		    $ad='EXACT_ANS';
+		} else {
+		    $ad='INCORRECT';
+		}
 	    }
 	    &Apache::response::handle_previous(\%previous,$ad);
 	    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
 	}
     }  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;
