';
$Apache::matchresponse::itemtable{'display'}=$table;
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
my $i=0;
foreach my $name (@names) {
- $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
+ # $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
$table.='\item['.$alphabet[$i].'] '.
$Apache::response::itemgroup{$name.'.text'};
$i++;
@@ -165,6 +176,7 @@ sub end_itemgroup {
$table.=' \end{description} \strut ';
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
$Apache::matchresponse::itemtable{'display'}=$table;
+ $Apache::lonxml::post_evaluate=0;
}
return $result;
}
@@ -207,7 +219,7 @@ sub end_item {
my $location=&Apache::lonxml::get_param('location',$parstack,
$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
- if (!$name) { $name=$Apache::lonxml::curdepth; }
+ if ($name eq "") { $name=$Apache::lonxml::curdepth; }
&Apache::lonxml::debug("Using a name of :$name:");
push @{ $Apache::response::itemgroup{'names'} }, $name;
$Apache::response::itemgroup{"$name.text"} = $text;
@@ -253,6 +265,7 @@ sub end_foilgroup {
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,$max,$randomize);
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'answer' ) {
$result=&displayanswers($max,$randomize);
} elsif ( $target eq 'grade') {
@@ -287,18 +300,30 @@ sub displayanswers {
$randomize,
&Apache::response::showallfoils(),
\%Apache::response::foilgroup);
- my $result=&Apache::response::answer_header('matchresponse');
my %name_letter_map;
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
%name_letter_map=
%{ $Apache::response::itemgroup{'name_letter_map'} };
}
- foreach my $name (@whichfoils) {
- my $value_name=$Apache::response::foilgroup{$name.'.value'};
- my $letter=$name_letter_map{$value_name};
- $result.=&Apache::response::answer_part('matchresponse',$letter);
+ my $result;
+ if ($Apache::lonhomework::type eq 'exam') {
+ my $i=0;
+ foreach my $name (@whichfoils) {
+ $result.=&Apache::response::answer_header('matchresponse',$i++);
+ my $value_name=$Apache::response::foilgroup{$name.'.value'};
+ my $letter=$name_letter_map{$value_name};
+ $result.=&Apache::response::answer_part('matchresponse',$letter);
+ $result.=&Apache::response::answer_footer('matchresponse');
+ }
+ } else {
+ $result=&Apache::response::answer_header('matchresponse');
+ foreach my $name (@whichfoils) {
+ my $value_name=$Apache::response::foilgroup{$name.'.value'};
+ my $letter=$name_letter_map{$value_name};
+ $result.=&Apache::response::answer_part('matchresponse',$letter);
+ }
+ $result.=&Apache::response::answer_footer('matchresponse');
}
- $result.=&Apache::response::answer_footer('matchresponse');
return $result;
}
@@ -309,7 +334,7 @@ sub grade_response {
$randomize,
&Apache::response::showallfoils(),
\%Apache::response::foilgroup);
- if (!defined($ENV{'form.submitted'})) { return; }
+ if (!&Apache::response::submitted()) { return; }
my %responsehash;
my %grade;
my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
@@ -429,7 +454,7 @@ sub displayfoils {
if ($target eq 'tex') {
$question.=' \\\\ '.$letter.':'.$text;
} else {
- $question.=' '.$letter.':'.$text;
+ $question.=' '.$letter.': '.$text;
}
}
} else {
@@ -462,7 +487,8 @@ sub displayfoils {
}
}
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
- $optionlist='\n";
}
@@ -502,7 +528,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*)/;
@@ -524,7 +550,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*)/;
@@ -636,13 +662,20 @@ sub end_foil {
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
$text=&Apache::lonxml::endredirection;
}
+
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
+ if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+ $text='\vskip 5mm $\triangleright$ '.$text;
+ }
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
- if (!$name) { $name=$Apache::lonxml::curdepth; }
+ if (!$name) {
+ &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:");
if (defined($Apache::response::foilnames{$name})) {
&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name));
@@ -654,28 +687,12 @@ sub end_foil {
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
- if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
- $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
- } else {
- $Apache::response::conceptgroup{"$name.text"} = $text;
- }
+ $Apache::response::conceptgroup{"$name.text"} = $text;
$Apache::response::conceptgroup{"$name.location"} = $location;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.value"} = $value;
- if ($Apache::lonhomework::type eq 'exam') {
- if ($target eq 'tex') {
- $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
- } else {
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
- } else {
- if ($target eq 'tex') {
- $Apache::response::foilgroup{"$name.text"} = $text;
- } else {
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
- }
+ $Apache::response::foilgroup{"$name.text"} = $text;
$Apache::response::foilgroup{"$name.location"} = $location;
}
}
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.