--- loncom/homework/chemresponse.pm 2005/06/30 18:56:35 1.60
+++ 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.60 2005/06/30 18:56:35 albertel Exp $
+# $Id: chemresponse.pm,v 1.63 2006/03/09 00:48:47 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -138,6 +138,7 @@ $molecule
JME Editor courtesy of Peter Ertl, Novartis
+
$insert_answer
@@ -155,7 +156,7 @@ CHEMPAGE
my $display=&mt('Draw Molecule');
if (defined($shown_text)) { $display=&mt($shown_text); }
my $result=<
+
CHEMINPUT
return $result;
}
@@ -250,6 +251,7 @@ sub start_organicresponse {
'options','width');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
+
return $result;
}
@@ -293,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;
}
@@ -316,7 +323,7 @@ sub start_organicstructure {
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 (!$webheight) { $webheight = $webwidth; }
if (!$texwidth) { $texwidth='90'; }
$result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n";
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
@@ -481,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;
}