--- loncom/homework/matchresponse.pm 2003/03/19 19:10:16 1.8
+++ loncom/homework/matchresponse.pm 2005/01/10 19:21:57 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.8 2003/03/19 19:10:16 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.49 2005/01/10 19:21:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,15 +25,13 @@
#
# http://www.lon-capa.org/
#
-# 2/21 Guy
package Apache::matchresponse;
use strict;
use HTML::Entities();
use Math::Random();
-use Apache::optionresponse;
-
-my @Items = ();
+use Apache::optionresponse();
+use Apache::lonlocal;
BEGIN {
&Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -49,6 +47,7 @@ sub start_matchresponse {
push (@Apache::lonxml::namespace,'matchresponse');
my $id = &Apache::response::start_response($parstack,$safeeval);
%Apache::hint::match=();
+ undef(%Apache::response::foilnames);
if ($target eq 'meta') {
$result=&Apache::response::meta_package_write('matchresponse');
} elsif ($target eq 'edit' ) {
@@ -68,6 +67,9 @@ sub start_matchresponse {
$safeeval,'max',
'randomize');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ } elsif ($target eq 'analyze') {
+ my $part_id="$Apache::inputtags::part.$id";
+ push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
}
@@ -80,6 +82,7 @@ sub end_matchresponse {
pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::matchresponse',
('foilgroup','foil','conceptgroup'));
+ undef(%Apache::response::foilnames);
return $result;
}
@@ -89,6 +92,7 @@ sub start_itemgroup {
my $result;
%Apache::response::itemgroup=();
%Apache::matchresponse::itemtable=();
+
if ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
@@ -103,9 +107,10 @@ sub start_itemgroup {
$safeeval,'randomize',
'location');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
- } elsif ($target eq 'web') {
+ } elsif ($target eq 'web' or $target eq 'tex') {
$Apache::matchresponse::itemtable{'location'}=
&Apache::lonxml::get_param('location',$parstack,$safeeval);
+ $Apache::matchresponse::TeXitemgroupwidth=&Apache::lonxml::get_param('TeXitemgroupwidth',$parstack,$safeeval,undef,0);
}
return $result;
}
@@ -114,12 +119,17 @@ sub end_itemgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
+ if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }
my @names=@{ $Apache::response::itemgroup{'names'} };
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
if ($randomize ne 'no' ) {
- @names=&whichorder($#names+1,$randomize,0,
- \%Apache::response::itemgroup)
+ @names=&Apache::response::whichorder($#names+1,$randomize,0,
+ \%Apache::response::itemgroup);
+ }
+ if ($target eq 'analyze') {
+ my $partid="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ push (@{ $Apache::lonhomework::analyze{"$partid.items"} }, @names);
}
my %letter_name_map;
my %name_letter_map;
@@ -128,10 +138,9 @@ sub end_itemgroup {
foreach my $name (@names) {
$letter_name_map{$alphabet[$i]}=$name;
$name_letter_map{$name}=$alphabet[$i];
- push @Items, $alphabet[$i];
$i++;
}
- $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
+ $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
if ($target eq 'web') {
my $table='
';
@@ -145,24 +154,25 @@ sub end_itemgroup {
$table.='
';
$Apache::matchresponse::itemtable{'display'}=$table;
} elsif ($target eq 'tex') {
- my $table=' \\\\\\\\ \begin{tabular}{ll} ';
+ 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) {
- $table.=' '.$alphabet[$i].' & '.
- $Apache::response::itemgroup{$name.'.text'}.
- ' \\\\ ';
+ $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
+ $table.='\item['.$alphabet[$i].'] '.
+ $Apache::response::itemgroup{$name.'.text'};
$i++;
}
- $table.=' \end{tabular} \\\\ ';
+ $table.=' \end{description} \strut ';
+ if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
$Apache::matchresponse::itemtable{'display'}=$table;
- } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+ }
return $result;
}
sub start_item {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' || $target eq 'tex') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {
my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
@@ -188,11 +198,11 @@ sub end_item {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text ='';
my $result = '';
- if ($target eq 'web' || $target eq 'tex') {
+ 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 'edit' || $target eq 'tex') {
+ $target eq 'edit' || $target eq 'tex' || $target eq 'analyze') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
my $location=&Apache::lonxml::get_param('location',$parstack,
$safeeval);
@@ -223,7 +233,7 @@ sub start_foilgroup {
my $result;
%Apache::response::foilgroup=();
$Apache::matchresponse::conceptgroup=0;
- &Apache::response::setrandomnumber();
+ &Apache::response::pushrandomnumber();
if ($target eq 'edit') {
$result.=&Apache::edit::start_table($token)
."
Collection Of Foils
Delete:"
@@ -237,7 +247,7 @@ sub start_foilgroup {
sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$safeeval,'-2');
@@ -247,20 +257,36 @@ sub end_foilgroup {
$result=&displayanswers($max,$randomize);
} elsif ( $target eq 'grade') {
&grade_response($max,$randomize);
+ } elsif ( $target eq 'analyze') {
+ my @shown=&whichfoils($max,$randomize);
+ &Apache::response::analyze_store_foilgroup(\@shown,
+ ['text','value','location']);
+ #FIXME need to store options in some way
}
+ &Apache::lonxml::increment_counter(&getfoilcounts($max));
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
+ &Apache::response::poprandomnumber();
return $result;
}
+sub whichfoils {
+ my ($max,$randomize)=@_;
+ return &Apache::response::whichorder(&getfoilcounts($max),
+ $randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
+}
+
sub displayanswers {
my ($max,$randomize,@opt)=@_;
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichfoils = &whichorder(&getfoilcounts($max),$randomize,
- &Apache::response::showallfoils(),
- \%Apache::response::foilgroup);
+ my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max),
+ $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'} })) {
@@ -279,25 +305,28 @@ sub displayanswers {
sub grade_response {
my ($max,$randomize)=@_;
- my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
- &Apache::response::showallfoils(),
- \%Apache::response::foilgroup);
+ my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
+ $randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
if (!defined($ENV{'form.submitted'})) { return; }
my %responsehash;
my %grade;
- my ($temp,$right,$wrong,$ignored)=(0,0,0,0);
+ my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
my %letter_name_map;
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
%letter_name_map=
%{ $Apache::response::itemgroup{'letter_name_map'} };
}
+ my @items;
foreach my $name (@whichfoils) {
- my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
+ my $response = &Apache::response::getresponse($temp,'letter');
+ push(@items,$response);
my $responsename = $letter_name_map{$response};
- $responsehash{$name}=$responsename;
my $value=$Apache::response::foilgroup{$name.'.value'};
if ( $response =~ /[^\s]/) {
- &Apache::lonxml::debug("submitted a $response for $value \n");
+ $responsehash{$name}=$responsename;
+ &Apache::lonxml::debug("submitted a $response($responsename) for $value \n");
if ($value eq $responsename) {
$grade{$name}='1'; $right++;
} else {
@@ -311,28 +340,54 @@ sub grade_response {
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+ my $itemstr =&Apache::lonnet::array2str(@items);
my $gradestr =&Apache::lonnet::hash2str(%grade);
- my %previous =&Apache::response::check_for_previous($responsestr,
- $part,$id);
+ my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored ");
- my $ad;
- if ($wrong==0 && $ignored==0) {
- $ad='EXACT_ANS';
- } elsif ($wrong==0 && $right==0) {
- #nothing submitted
- } else {
- if ($ignored==0) {
- $ad='INCORRECT';
- } else {
- $ad='MISSING_ANSWER';
- }
- }
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
+ $Apache::lonhomework::results{"resource.$part.$id.submissionitems"}=
+ $itemstr;
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
$gradestr;
- $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
- &Apache::response::handle_previous(\%previous,$ad);
+ if ($Apache::lonhomework::type eq 'survey') {
+ if ($ignored == 0) {
+ my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+ &Apache::response::handle_previous(\%previous,$ad);
+ } elsif ($wrong==0 && $right==0) {
+ } else {
+ my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+ &Apache::response::handle_previous(\%previous,$ad);
+ }
+ } elsif (!$Apache::lonhomework::scantronmode) {
+ my $ad;
+ if ($wrong==0 && $ignored==0) {
+ $ad='EXACT_ANS';
+ } elsif ($wrong==0 && $right==0) {
+ #nothing submitted
+ } else {
+ if ($ignored==0) {
+ $ad='INCORRECT';
+ } else {
+ $ad='MISSING_ANSWER';
+ }
+ }
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
+ &Apache::response::handle_previous(\%previous,$ad);
+ } else {
+ my $ad;
+ if ($wrong==0 && $right==0) {
+ #nothing submitted
+ } else {
+ $ad='ASSIGNED_SCORE';
+ $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+ $ad;
+ $Apache::lonhomework::results{"resource.$part.$id.awarded"}=
+ $right/(scalar(@whichfoils));
+ $Apache::lonhomework::results{"resource.$part.$id.numfoils"}=
+ scalar(@whichfoils);
+ }
+ }
}
sub itemdisplay {
@@ -350,12 +405,12 @@ sub displayfoils {
my ($target,$max,$randomize)=@_;
my $result;
my $question;
- my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize,
- &Apache::response::showallfoils(),
- \%Apache::response::foilgroup);
+ my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
+ $randomize,
+ &Apache::response::showallfoils(),
+ \%Apache::response::foilgroup);
my $part=$Apache::inputtags::part;
my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
- my $status=$Apache::inputtags::status[-1];
my %letter_name_map;
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
%letter_name_map=
@@ -366,7 +421,7 @@ sub displayfoils {
%name_letter_map=
%{ $Apache::response::itemgroup{'name_letter_map'} };
}
- if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) {
+ if ( &Apache::response::show_answer() && ($target ne 'tex')) {
foreach my $name (@whichfoils) {
my $text=$Apache::response::foilgroup{$name.'.text'};
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -379,11 +434,14 @@ sub displayfoils {
}
} else {
my $i = 0;
- my $temp=0;
+ my $temp=1;
my $id=$Apache::inputtags::response[-1];
my $part=$Apache::inputtags::part;
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
- my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+ my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+ my @alphabet=('A'..'Z');
+ my @used_letters=sort(keys(%letter_name_map));
+ my $internal_counter=$Apache::lonxml::counter;
foreach my $name (@whichfoils) {
my $lastopt=$lastresponse{$name};
my $last_letter=$name_letter_map{$lastopt};
@@ -393,38 +451,41 @@ sub displayfoils {
} else {
if ($Apache::lonhomework::type ne 'exam') {
$optionlist='\framebox[5 mm][s]{\tiny\strut}';
- } else {
- $optionlist='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
}
}
my $option;
- foreach $option (sort(keys(%letter_name_map))) {
+ foreach $option (@used_letters) {
if ($option eq $last_letter) {
if ($target ne 'tex') {$optionlist.="\n";}
} else {
if ($target ne 'tex') {$optionlist.="\n";}
}
}
- if ($target ne 'tex') {
+ if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
$optionlist='\n";
- } else {
- $optionlist=$optionlist;
}
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($target ne 'tex') {
- $question.=' '.$optionlist.$text."\n";
+ if ($Apache::lonhomework::type ne 'exam') {
+ $question.=" \n".$optionlist.$text;
+ } else {
+ $question.=" \n".$text;
+ }
if ($Apache::lonhomework::type eq 'exam') {
- $question.=&Apache::optionresponse::webbubbles(\@Items,\@Items);
+ my @blank;
+ $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
}
} else {
if ($Apache::lonhomework::type eq 'exam') {
$question.=' '.$optionlist.$text."\n";
- $question.=&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate} \vskip -7 mm \strut ';
- &Apache::lonxml::increment_counter();
+ my @emptyItems = ();
+ for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
+ $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
+ $internal_counter++;
} else {
- $question.=' \\\\ '.$optionlist.$text."\n";
+ $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
}
}
$temp++;
@@ -435,11 +496,49 @@ sub displayfoils {
} elsif ($result=&itemdisplay('bottom')) {
$result=$question.$result;
} elsif ($result=&itemdisplay('right')) {
- $result='
'.$question.'
'.$result.
- '
';
+ if ($target ne 'tex') {
+ #remove the first
+ $question=~s| ||;
+ $result='
'.$question.
+ '
'.$result.'
';
+ } else {
+ my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+ my ($lefttabsize,$righttabsize)=(0,0);
+ if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+ $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+ $lefttabsize=$tabsize*$1/100;
+ $righttabsize=0.95*($tabsize-$lefttabsize);
+ } else {
+ $tabsize=~/(\d+\.?\d*)/;
+ $lefttabsize=$1/2.1;
+ $righttabsize=0.95*($1-$lefttabsize);
+ }
+ $lefttabsize.=' mm ';
+ $righttabsize.=' mm ';
+ $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
+ }
} elsif ($result=&itemdisplay('left')) {
- $result='
'.$result.'
'.$question.
- '
';
+ if ($target ne 'tex') {
+ #remove the first
+ $question=~s| ||;
+ $result='
'.$result.
+ '
'.$question.'
';
+ } else {
+ my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+ my ($lefttabsize,$righttabsize)=(0,0);
+ if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+ $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+ $lefttabsize=$tabsize*$1/100;
+ $righttabsize=0.95*($tabsize-$lefttabsize);
+ } else {
+ $tabsize=~/(\d+\.?\d*)/;
+ $lefttabsize=$1/2.1;
+ $righttabsize=0.95*($1-$lefttabsize);
+ }
+ $lefttabsize.=' mm ';
+ $righttabsize.=' mm ';
+ $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
+ }
}
if ($target ne 'tex') {$result.=" ";} else {$result.=' \\\\ ';}
return $result;
@@ -455,52 +554,6 @@ sub getfoilcounts {
return $count;
}
-sub whichorder {
- my ($max,$randomize,$showall,$hash)=@_;
- #&Apache::lonxml::debug("man $max randomize $randomize");
- if (!defined(@{ $$hash{'names'} })) { return; }
- my @names = @{ $$hash{'names'} };
- my @whichopt =();
- my (%top,@toplist,%bottom,@bottomlist);
- if (!($showall || ($randomize eq 'no'))) {
- my $current=0;
- foreach my $name (@names) {
- $current++;
- if ($$hash{"$name.location"} eq 'top') {
- $top{$name}=$current;
- } elsif ($$hash{"$name.location"} eq 'bottom') {
- $bottom{$name}=$current;
- }
- }
- }
- while ((($#whichopt+1) < $max) && ($#names > -1)) {
- #&Apache::lonxml::debug("Have $#whichopt max is $max");
- my $aopt;
- if ($showall || ($randomize eq 'no')) {
- $aopt=0;
- } else {
- $aopt=int(&Math::Random::random_uniform() * ($#names+1));
- }
- #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
- $aopt=splice(@names,$aopt,1);
- #&Apache::lonxml::debug("Picked $aopt");
- if ($top{$aopt}) {
- $toplist[$top{$aopt}]=$aopt;
- } elsif ($bottom{$aopt}) {
- $bottomlist[$bottom{$aopt}]=$aopt;
- } else {
- push (@whichopt,$aopt);
- }
- }
- for (my $i=0;$i<=$#toplist;$i++) {
- if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) }
- }
- for (my $i=0;$i<=$#bottomlist;$i++) {
- if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) }
- }
-
- return @whichopt;
-}
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -525,31 +578,12 @@ sub end_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::matchresponse::conceptgroup=0;
my $result='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
- #if not there aren't any foils to display and thus no question
- if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
- my @names = @{ $Apache::response::conceptgroup{'names'} };
- my $pick=int(&Math::Random::random_uniform() * ($#names+1));
- my $name=$names[$pick];
- push @{ $Apache::response::foilgroup{'names'} }, $name;
- $Apache::response::foilgroup{"$name.value"} =
- $Apache::response::conceptgroup{"$name.value"};
- $Apache::response::foilgroup{"$name.text"} =
- $Apache::response::conceptgroup{"$name.text"};
- $Apache::response::foilgroup{"$name.location"} =
- $Apache::response::conceptgroup{"$name.location"};
- my $concept = &Apache::lonxml::get_param('concept',$parstack,
- $safeeval);
- $Apache::response::foilgroup{"$name.concept"} = $concept;
- &Apache::lonxml::debug("Selecting $name in $concept");
- if ($target eq 'web') {
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
- push(@{ $Apache::hint::match{"$part_id.concepts"} },
- $concept);
- $Apache::hint::match{"$part_id.concept.$concept"}=
- $Apache::response::conceptgroup{'names'};
- }
- }
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ &Apache::response::pick_foil_for_concept($target,
+ ['value','text','location'],
+ \%Apache::hint::match,
+ $parstack,$safeeval);
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -564,8 +598,11 @@ sub insert_conceptgroup {
sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' || $target eq 'tex') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
&Apache::lonxml::startredirection;
+ if ($target eq 'analyze') {
+ &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+ }
} elsif ($target eq 'edit') {
$result=&Apache::edit::tag_start($target,$token,"Foil");
my $level='-2';
@@ -596,17 +633,30 @@ sub end_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $text ='';
my $result = '';
- if ($target eq 'web' || $target eq 'tex') {
+ 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') {
+
+ 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);
- 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) {
+ &Apache::lonxml::error("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));
+ }
+ $Apache::response::foilnames{$name}++;
+ my $location =&Apache::lonxml::get_param('location',$parstack,
+ $safeeval);
if ( $Apache::matchresponse::conceptgroup
&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;
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.