--- loncom/homework/chemresponse.pm 2005/05/26 21:26:25 1.56 +++ loncom/homework/chemresponse.pm 2006/03/09 00:48:47 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # chemical equation style response # -# $Id: chemresponse.pm,v 1.56 2005/05/26 21:26:25 albertel Exp $ +# $Id: chemresponse.pm,v 1.63 2006/03/09 00:48:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -81,6 +81,12 @@ JMESECTION } if ($molecule) { $molecule=''; } + my $insert_answer; + if ($shown_text eq '') { + $insert_answer= + ''; + } + my $body=< @@ -99,22 +105,45 @@ function submitSmiles() { function openHelpWindow() { window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600"); } +function substituent(r) {document.applets.JME.setSubstituent(r);}
- +
+ + + +
+ +
+ You have to enable Java and JavaScript on your machine. $molecule
JME Editor courtesy of Peter Ertl, Novartis - -
- +$insert_answer +
+    - +
@@ -127,7 +156,7 @@ CHEMPAGE my $display=&mt('Draw Molecule'); if (defined($shown_text)) { $display=&mt($shown_text); } my $result=< + CHEMINPUT return $result; } @@ -222,6 +251,7 @@ sub start_organicresponse { 'options','width'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } + return $result; } @@ -265,7 +295,12 @@ sub end_organicresponse { } $result.=&Apache::response::answer_footer('organicresponse'); } - &Apache::response::end_response; + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter(&Apache::response::repetition()); + } + &Apache::response::end_response(); return $result; } @@ -286,7 +321,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'}. @@ -449,7 +488,12 @@ sub end_reactionresponse { } $result.=&Apache::response::answer_footer('reactionresponse'); } - &Apache::response::end_response; + + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter(&Apache::response::repetition()); + } + &Apache::response::end_response(); return $result; }