--- loncom/homework/matchresponse.pm 2005/02/12 01:13:56 1.51 +++ loncom/homework/matchresponse.pm 2005/06/21 21:00:55 1.54 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.51 2005/02/12 01:13:56 albertel Exp $ +# $Id: matchresponse.pm,v 1.54 2005/06/21 21:00:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,7 @@ use HTML::Entities(); use Math::Random(); use Apache::optionresponse(); use Apache::lonlocal; +use Apache::lonnet; BEGIN { &Apache::lonxml::register('Apache::matchresponse',('matchresponse')); @@ -437,7 +438,7 @@ sub displayfoils { if ($target eq 'tex') { $question.=' \\\\ '.$letter.':'.$text; } else { - $question.='
'.$letter.':'.$text; + $question.='
'.$letter.': '.$text; } } } else { @@ -510,7 +511,7 @@ sub displayfoils { $result='
'.$question. ''.$result.'
'; } else { - my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); + my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); my ($lefttabsize,$righttabsize)=(0,0); if ($Apache::matchresponse::TeXitemgroupwidth ne '') { $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; @@ -532,7 +533,7 @@ sub displayfoils { $result='
'.$result. ''.$question.'
'; } else { - my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); + my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); my ($lefttabsize,$righttabsize)=(0,0); if ($Apache::matchresponse::TeXitemgroupwidth ne '') { $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; @@ -655,7 +656,7 @@ sub end_foil { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); if (!$name) { - &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction."); + &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); $name=$Apache::lonxml::curdepth; } &Apache::lonxml::debug("Using a name of :$name:");