--- loncom/homework/optionresponse.pm 2006/03/15 00:08:53 1.134
+++ loncom/homework/optionresponse.pm 2008/01/31 05:14:06 1.148
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.134 2006/03/15 00:08:53 foxr Exp $
+# $Id: optionresponse.pm,v 1.148 2008/01/31 05:14:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -71,6 +71,8 @@ sub start_optionresponse {
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+ push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
+
}
return $result;
}
@@ -183,8 +185,10 @@ sub end_foilgroup {
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
+ $Apache::lonxml::post_evaluate=0;
} elsif ( $target eq 'answer') {
$result.=&displayanswers($max,$randomize,@opt);
+
} elsif ( $target eq 'analyze') {
my @shown = &whichfoils($max,$randomize);
&Apache::response::analyze_store_foilgroup(\@shown,
@@ -273,7 +277,14 @@ sub end_foilgroup {
}
}
}
- &Apache::lonxml::increment_counter(&getfoilcounts($max));
+ my $part_id = $Apache::inputtags::part;
+ my $response_id = $Apache::inputtags::response[-1];
+ &Apache::lonxml::increment_counter(&getfoilcounts($max),
+ "$part_id.$response_id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
+
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table();
}
@@ -421,7 +432,8 @@ sub displayfoils {
}
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $optionlist='<select name="HWVAL_'.
+ $optionlist='<select onchange="javascript:setSubmittedPart(\''.
+ $part.'\');" name="HWVAL_'.
$Apache::inputtags::response['-1'].':'.$temp.'">'.
$optionlist."</select>\n";
} else {
@@ -448,7 +460,7 @@ sub displayfoils {
$texoptionlist = &optionlist_correction($TeXlayout,@opt);
}
if ($text=~/<drawoptionlist\s*\/>/) {
- $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+ $text=~s|<drawoptionlist\s*\/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |g;
}
if ($text=~m/\\item /) {
@@ -473,6 +485,13 @@ sub displayfoils {
}
}
}
+
+ if ($target eq 'web') {
+ &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,
+ [\@whichopt,
+ 'submissiongrading']);
+ }
+
if ($target ne 'tex') {
return $result.$break;
} else {
@@ -481,65 +500,6 @@ sub displayfoils {
}
-# Correct a single option list element.
-# - For embedded <display></display> tags,
-# we pass literally the stuff between them.
-# - For everything else, we run through latex_special_symbols
-# so that any symbols that have meaning to LaTeX will be
-# correctly escaped.
-#
-sub correct_option {
- my $option = shift;
-
-
- # There's probably a beter way with perl if I was
- # more of a regexp wiz..(RF).
-
- my $strlen = length($option);
- my $here = 0; # Where to start searching for <display></display>
- my $result =""; # The return string is built here.
-
- while ($here < $strlen) {
- # look for an opening <display> tag:
-
- my $openloc = index($option, "<display>", $here);
- if ($openloc == -1) {
- # No more... operate with latex_special_symbols on
- # the rest of the string.
-
- $result .= &Apache::lonxml::latex_special_symbols(substr($option, $here));
- return $result;
- } else {
- # Need to pass the string up to the <display> tag
- # through l_s_s ...
- $result .= &Apache::lonxml::latex_special_symbols(substr($option, $here, $openloc-$here));
- }
- # look for the closing </display> tag...
- # We're a bit stupid..or tolerant...
- # in that if the user forgets the </display> tag
- # we infer they intended one at the end of the option.
- $openloc += 9; # 9 chars in <display>
-
- my $closeloc = index($option, "</display>", $openloc); # 9 chars in <display>
- if ($closeloc == -1) {
- $closeloc = $strlen + 9; # 10chars in </display> faked off end.
- }
- # Pass from openloc through closeloc without any interpretation:
-
- &Apache::lonnet::logthis("Segment inside display: $openloc through $closeloc");
- $result .= substr($option, $openloc, $closeloc - $openloc);
- $here = $closeloc + 10; # Next search is after the </display>
- }
-
- return $result;
-
- # return &Apache::lonxml::latex_special_symbols($option);
-}
-
-# Correct the option list elements so that if there
-# are special symbosl that have meaning to LaTeX
-# they get fixed up to display correctly.
-
sub optionlist_correction {
my ($TeXlayout,@options) = @_;
my $texoptionlist='\\item [] Choices: ';
@@ -547,7 +507,7 @@ sub optionlist_correction {
if (scalar(@options) > 0) {
foreach my $option (@options) {
$texoptionlist.='{\bf '.
- &correct_option($option).
+ &Apache::lonxml::latex_special_symbols($option).
'}';
if ($TeXlayout eq 'vertical') {
$texoptionlist.=' \vskip 0 mm ',
@@ -590,25 +550,32 @@ sub webbubbles {
sub bubbles {
- my ($ralphabet,$ropt,$response) = @_;
+ my ($ralphabet,$ropt,$response, $max_width) = @_;
my @alphabet = @$ralphabet;
my @opt = @$ropt;
my ($result,$head,$line) =('','','');
my $number_of_bubbles = $#opt + 1;
my $current_length = 0;
my $textwidth;
- if ($env{'form.textwidth'} ne '') {
+ if (defined($max_width)) {
+ $textwidth=$max_width;
+ &Apache::lonxml::debug("Max width passed in: $max_width");
+ } elsif ($env{'form.textwidth'} ne '') {
$env{'form.textwidth'}=~/(\d+)/;
$textwidth=$1;
+ &Apache::lonxml::debug("Max width from form: $textwidth");
} else {
$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
$textwidth=$1.'.'.$2;
+ &Apache::lonxml::debug("Max width defaults? $textwidth");
}
+ &Apache::lonxml::debug("Final maxwidth: $textwidth");
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
my $leftmargin;
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
+
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
@@ -747,25 +714,29 @@ sub end_foil {
sub start_drawoptionlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target ne 'meta') {
+ if ($target !~ /^(?:meta|answer|modified|edit)$/) {
return $token->[4];
}
}
sub end_drawoptionlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if ($target ne 'meta') {
+ if ($target !~ /^(?:meta|answer|modified|edit)$/) {
return $token->[2];
}
}
sub insert_foil {
- return '
+ return '
<foil name="" value="unused">
<startouttext />
<endouttext />
</foil>';
}
+
+sub insert_drawoptionlist {
+ return '<drawoptionlist />';
+}
1;
__END__