--- loncom/homework/response.pm 2007/11/05 11:46:08 1.182
+++ loncom/homework/response.pm 2008/03/06 16:28:20 1.188
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.182 2007/11/05 11:46:08 foxr Exp $
+# $Id: response.pm,v 1.188 2008/03/06 16:28:20 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -454,6 +454,7 @@ sub end_customresponse {
&Apache::lonxml::increment_counter(&Apache::response::repetition(),
"$part.$id");
if ($target eq 'analyze') {
+ $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
&Apache::lonhomework::set_bubble_lines();
}
}
@@ -675,6 +676,7 @@ sub start_responseparam {
$Apache::lonnet::packagetab{"$tag&$name&display"};
$token->[2]->{'default'}=
$Apache::lonnet::packagetab{"$tag&$name&default"};
+ $token->[3] = ['name','type','description','default'];
$constructtag=1;
}
if ($constructtag) {
@@ -788,6 +790,8 @@ sub next_answer {
sub answer_part {
my ($type,$answer,$args) = @_;
+ &Apache::lonxml::debug("In answerpart :$type:$answer:$args:");
+
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
if (!$args->{'no_verbatim'}) {
@@ -799,9 +803,13 @@ sub answer_part {
last;
}
}
- if ($answer ne '') {
- $answer = '\verb'.$to_use.$answer.$to_use;
- }
+ my $answerelements=$answer;
+ $answer='';
+ foreach my $element (split(/[\;\:]/,$answerelements)) {
+ if ($element ne '') {
+ $answer.= '\noindent\verb'.$to_use.$element.$to_use.'\newline';
+ }
+ }
}
if ($answer ne '') {
push(@answer_bits,$answer);
@@ -811,7 +819,8 @@ sub answer_part {
$result .= '
';
$need_row_start = 0;
}
- $result .= ''.$answer.' | ';
+ $answer=~s/\; /\<\/nobr\>\
\/gs;
+ $result .= ''.$answer.' | ';
}
return $result;
}
@@ -820,12 +829,15 @@ sub answer_footer {
my ($type) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- my $columns = scalar(@answer_bits);
- $result = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline ';
+ my $columns = scalar(@answer_bits)-1;
+ $result = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|'.'p{3cm}|'x$columns.'}\hline ';
$result .= join(' & ',@answer_bits);
$result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';
} else {
- $result = '
';
+ if (!$need_row_start) {
+ $result .= '';
+ }
+ $result .= '';
}
return $result;
}
@@ -884,7 +896,6 @@ sub getresponse {
if (!defined($lines)) {
$lines = 1;
}
-
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,
@@ -895,10 +906,9 @@ sub getresponse {
my $line;
for ($line = 0; $line < $lines; $line++) {
- $response = $env{'scantron.'.
- ($Apache::lonxml::counter+$offset-1+$line).
- '.answer'};
- if ((defined($response)) && ($response ne " ")) {
+ my $theline = $Apache::lonxml::counter+$offset-1+$line;
+ $response = $env{"scantron.$theline.answer"};
+ if ((defined($response)) && ($response ne "") && ($response ne " ")) {
last;
}
@@ -907,7 +917,6 @@ sub getresponse {
# save bubbled letter for later
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
$response;
-
if ($resulttype ne 'letter') {
if ($resulttype eq 'A is 1') {
$response = $let_to_num{$response}+1;