--- loncom/homework/rankresponse.pm 2003/03/26 18:43:29 1.9 +++ loncom/homework/rankresponse.pm 2003/04/02 20:23:52 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.9 2003/03/26 18:43:29 sakharuk Exp $ +# $Id: rankresponse.pm,v 1.12 2003/04/02 20:23:52 sakharuk Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -31,8 +31,6 @@ use strict; use HTML::Entities(); use Apache::optionresponse; -my $flag_for_exam_printing = 1; - BEGIN { &Apache::lonxml::register('Apache::rankresponse',('rankresponse')); } @@ -266,7 +264,7 @@ sub displayfoils { if ($target ne 'tex') {$optionlist.="\n";} } } - if ($target ne 'tex') { + if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { $optionlist='\n"; @@ -275,9 +273,13 @@ sub displayfoils { } my $text=$Apache::response::foilgroup{$name.'.text'}; if ($target ne 'tex') { - $result.='
'.$optionlist.$text."\n"; + if ($Apache::lonhomework::type ne 'exam') { + $result.='
'.$optionlist.$text."\n"; + } else { + $result.='
'.$text."\n"; + } if ($Apache::lonhomework::type eq 'exam') { - $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt); + $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp); } } else { if ($Apache::lonhomework::type eq 'exam') { @@ -459,7 +461,7 @@ sub end_foil { && !&Apache::response::showallfoils() ) { push @{ $Apache::response::conceptgroup{'names'} }, $name; $Apache::response::conceptgroup{"$name.value"} = $value; - if ($target eq 'tex') { + if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; } else { $Apache::response::conceptgroup{"$name.text"} = $text; @@ -468,11 +470,10 @@ sub end_foil { } else { push @{ $Apache::response::foilgroup{'names'} }, $name; $Apache::response::foilgroup{"$name.value"} = $value; - if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) { + if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; - $flag_for_exam_printing = 0; } else { - if ($target eq 'tex') { + if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; } else { $Apache::response::foilgroup{"$name.text"} = $text;