--- loncom/homework/caparesponse/caparesponse.pm 2004/02/19 19:24:38 1.126.2.1
+++ loncom/homework/caparesponse/caparesponse.pm 2004/02/13 21:12:54 1.131
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.126.2.1 2004/02/19 19:24:38 albertel Exp $
+# $Id: caparesponse.pm,v 1.131 2004/02/13 21:12:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
package Apache::caparesponse;
use strict;
use capa;
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
@@ -179,7 +180,7 @@ sub end_numericalresponse {
my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
$safeeval);
if ($target eq 'web') {
- $result="
The correct answer is ";
+ $result="
".&mt('The correct answer is')." ";
}
for (my $i=0; $i <= $#answers; $i++) {
my $answer=$answers[$i];
@@ -459,7 +460,10 @@ sub make_numerical_bubbles {
&Math::Random::random_set_seed(@oldseed);
return @bubble_values;
}
- #FIXME what to do when not enough incorrects specified?
+ if (defined($$incorrect[0]) &&
+ scalar(@$incorrect)+1 < $number_of_bubbles) {
+ &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them.");
+ }
}
my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
my @powers = (1..$number_of_bubbles);
@@ -527,16 +531,18 @@ sub start_stringresponse {
[['cs','Case Sensitive'],['ci','Case Insensitive'],
['mc','Case Insensitive, Any Order'],
['re','Regular Expression']],$token);
+ $result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',
+ [['inline','Inline']],$token);
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
- my $constructtag;
- $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'answer',
- 'type');
- if ($constructtag) {
- $result = &Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::handle_insert();
- }
+ my $constructtag;
+ $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'answer',
+ 'type','answerdisplay');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ $result.=&Apache::edit::handle_insert();
+ }
} elsif ($target eq 'answer' || $target eq 'grade') {
&Apache::response::reset_params();
}
@@ -551,6 +557,7 @@ sub end_stringresponse {
my $id=$Apache::inputtags::response[-1];
my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+ my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);
&Apache::lonxml::debug("current $answer ".$token->[2]);
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
@@ -613,7 +620,8 @@ sub end_stringresponse {
my $status = $Apache::inputtags::status['-1'];
if ( &Apache::response::show_answer() ) {
if ($target eq 'web') {
- $result="
The correct answer is ".$answer;
+ $result=($answerdisplay eq 'inline'?'':"
".&mt('The correct answer is')." ")
+ .$answer;
# join(', ',@answers).".
";
}
}