--- loncom/homework/chemresponse.pm	2004/01/20 20:30:48	1.28
+++ loncom/homework/chemresponse.pm	2004/08/12 04:33:22	1.38
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.28 2004/01/20 20:30:48 albertel Exp $
+# $Id: chemresponse.pm,v 1.38 2004/08/12 04:33:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,34 @@ BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
 }
 
-sub seperate_jme_window {
+sub chem_standard_order {
+    my ($reaction) = @_;
+    my ($re,$pr) = split(/->|<=>/,$reaction);
+    my @reactants = split(/\s\+/,$re);
+    my @products =  split(/\s\+/,$pr);
+    foreach my $substance (@reactants,@products) {
+	$substance =~ s/(\^\d*)\s+/$1_/g;         # protect superscript space
+	$substance =~ s/\s*//g;                   # strip whitespace
+	$substance =~ s/_/ /g;                    # restore superscript space
+    }
+    @reactants = sort @reactants;
+    @products = sort @products;
+    my $standard = '';
+    foreach my $substance (@reactants) {
+	$standard .= $substance;
+	$standard .= ' + ';
+    }
+    $standard =~ s/ \+ $//;              # get rid of trailing plus sign
+    $standard .= ' -> ';
+    foreach my $substance (@products) {
+	$standard .= $substance;
+	$standard .= ' + ';
+    }
+    $standard =~ s/ \+ $//;              # get rid of trailing plus sign
+    return $standard;
+}
+
+sub separate_jme_window {
     my ($smile_input,$jme_input,$molecule,$options)=@_;
     my $smilesection;
     if (defined($smile_input)) {
@@ -92,7 +119,7 @@ $molecule
 </body>
 </html>
 CHEMPAGE
-    $body=&HTML::Entities::encode($body);
+    $body=&HTML::Entities::encode($body,'<>&"');
     $body=~s/\n/ /g;
     my $result=<<CHEMINPUT;
 <input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.document.open('text/html','replace');editor.document.writeln('$body')" />
@@ -117,7 +144,7 @@ sub start_organicresponse {
 	}
 	my $options=&Apache::lonxml::get_param('options',$parstack,
 					       $safeeval);
-	$result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
+	$result=&separate_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);
@@ -129,7 +156,7 @@ sub start_organicresponse {
 				    $token,40);
 	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
 						$safeeval);
-	$result .=&seperate_jme_window(undef,
+	$result .=&separate_jme_window(undef,
 		      &Apache::edit::html_element_name('molecule'),
 		      $molecule,$options);
 	$result .='</nobr><br /><nobr>';
@@ -138,13 +165,13 @@ sub start_organicresponse {
 	$result .=&Apache::edit::hidden_arg('jmeanswer',$token);
 	my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
 						 $safeeval);
-	$result .=&seperate_jme_window(
+	$result .=&separate_jme_window(
                       &Apache::edit::html_element_name('answer'),
                       &Apache::edit::html_element_name('jmeanswer'),
 		      $jmeanswer,$options);
 	$result .='</nobr><br />';
 	$result .=&Apache::edit::checked_arg('Options:','options',
-				    [ ['autoez','Auto E,Z sterochemistry'],
+				    [ ['autoez','Auto E,Z stereochemistry'],
 				      ['multipart','Multipart Structures'],
 				      ['nostereo','No stereochemistry'],
 				      ['reaction','Is a reaction'],
@@ -165,7 +192,7 @@ sub end_organicresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
-	&Apache::response::setup_params($$tagstack[-1]);
+	&Apache::response::setup_params($$tagstack[-1],$safeeval);
 	my $response = &Apache::response::getresponse();
 	if ( $response =~ /[^\s]/) {
 	    my $partid = $Apache::inputtags::part;
@@ -218,7 +245,7 @@ sub start_organicstructure {
 	    'cgi.'.$id.'.PNG' => 1,
 	    'cgi.'.$id.'.WIDTH' => $width );
     } elsif ($target eq 'tex') {
-	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);
+	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
 	if (!$texwidth) { $texwidth='90'; }
 	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
 	my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
@@ -248,7 +275,7 @@ sub start_organicstructure {
 	    $options.= ',multipart,number';
 	}
 						   
-	$result .=&seperate_jme_window(undef,
+	$result .=&separate_jme_window(undef,
 				 &Apache::edit::html_element_name('molecule'),
 				       $molecule,$options);
 	$result.="</nobr><br />";
@@ -286,10 +313,10 @@ sub edit_reaction_button {
     function create_reaction_window_${id}_${field} () {
 	editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
 	editor.document.open('text/html','replace');
-	editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0">  <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
+	editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0">  <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
     }
 </script>
-<input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
+<input type='button' value='Edit Answer' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
 EDITREACTION
     return $result;
 }
@@ -304,7 +331,16 @@ sub start_reactionresponse {
 	my $partid = $Apache::inputtags::part;
 	my $id = $Apache::inputtags::response['-1'];
 	my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
-	$result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
+	if ($reaction eq '') {  $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }
+	my $status=$Apache::inputtags::status['-1'];
+	if ($status eq 'CAN_ANSWER') {
+	    $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
+	}
+	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);
+	}
     } elsif ($target eq "edit") {
 	$result .=&Apache::edit::tag_start($target,$token);
 	my $answer=&Apache::lonxml::get_param('answer',$parstack,
@@ -312,11 +348,16 @@ sub start_reactionresponse {
 	$result .='<nobr>'.
 	    &Apache::edit::text_arg('Answer:','answer',$token,40);
 	$result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
+	my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
+	$result.='<nobr>'.
+	    &Apache::edit::text_arg('Initial Reation:','initial',$token,40);
+	$result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</nobr>';
 	
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     }  elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'answer');
+						     $safeeval,'answer',
+						     'initial');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
     return $result;
@@ -326,7 +367,7 @@ sub end_reactionresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
-	&Apache::response::setup_params($$tagstack[-1]);
+	&Apache::response::setup_params($$tagstack[-1],$safeeval);
 	my $response = &Apache::response::getresponse();
 	if ( $response =~ /[^\s]/) {
 	    my $partid = $Apache::inputtags::part;
@@ -337,7 +378,8 @@ sub end_reactionresponse {
 	    my $ad;
 	    foreach my $answer (@answers) {
 		&Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
-		if ($response eq $answer) {
+		if (&chem_standard_order($response) eq 
+		    &chem_standard_order($answer)) {
 		    $ad='EXACT_ANS';
 		} else {
 		    $ad='INCORRECT';
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>