--- loncom/homework/radiobuttonresponse.pm 2001/01/11 22:17:30 1.4 +++ loncom/homework/radiobuttonresponse.pm 2006/03/27 21:18:16 1.106 @@ -1,106 +1,659 @@ # The LearningOnline Network with CAPA # mutliple choice style responses - -# 11/23,11/24,11/28 Gerd Kortemeyer +# +# $Id: radiobuttonresponse.pm,v 1.106 2006/03/27 21:18:16 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# package Apache::radiobuttonresponse; use strict; +use HTML::Entities(); +use Apache::lonlocal; +use Apache::lonnet; -sub BEGIN { - &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse')); +BEGIN { + &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse')); } sub start_radiobuttonresponse { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - #when in a radiobutton response use these - &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil')); - my $id = &Apache::response::start_response($parstack,$safeeval); - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + #when in a radiobutton response use these + &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); + push (@Apache::lonxml::namespace,'radiobuttonresponse'); + my $id = &Apache::response::start_response($parstack,$safeeval); + %Apache::hint::radiobutton=(); + undef(%Apache::response::foilnames); + if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('radiobuttonresponse'); + } elsif ($target eq 'edit' ) { + $result.=&Apache::edit::start_table($token). + ''.&Apache::lonxml::description($token). + &Apache::loncommon::help_open_topic('Radio_Response_Problems'). + "Delete:". + &Apache::edit::deletelist($target,$token) + ." ".&Apache::edit::end_row() + .&Apache::edit::start_spanning_row(); + $result.= + &Apache::edit::text_arg('Max Number Of Shown Foils:','max', + $token,'4'). + &Apache::edit::select_arg('Randomize Foil Order','randomize', + ['yes','no'],$token). + &Apache::edit::select_arg('Display Direction','direction', + ['vertical','horizontal'],$token). + &Apache::edit::end_row(). + &Apache::edit::start_spanning_row()."\n"; + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'max', + 'randomize','direction'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } elsif ($target eq 'tex') { + my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval, + undef,0); + if ($type eq '1') { + $result .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}'; + } elsif ($type eq 'A') { + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; + } elsif ($type eq 'a') { + $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}'; + } elsif ($type eq 'i') { + $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}'; + } else { + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; + } + $result .= '\begin{enumerate}'; + } elsif ($target eq 'analyze') { + my $part_id="$Apache::inputtags::part.$id"; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + } + return $result; } sub end_radiobuttonresponse { - &Apache::response::end_response; - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'edit') { $result=&Apache::edit::end_table(); } + if ($target eq 'tex') { $result .= '\end{enumerate}'; } + &Apache::response::end_response; + pop @Apache::lonxml::namespace; + &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); + undef(%Apache::response::foilnames); + return $result; } -%Apache::response::foilgroup={}; +%Apache::response::foilgroup=(); sub start_foilgroup { - %Apache::response::foilgroup={}; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + %Apache::response::foilgroup=(); + $Apache::radiobuttonresponse::conceptgroup=0; + &Apache::response::pushrandomnumber(); + if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { + $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; + } + return $result; +} + +sub storesurvey { + if ( !&Apache::response::submitted() ) { return ''; } + my $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']}; + &Apache::lonxml::debug("Here I am!:$response:"); + if ( $response !~ /[0-9]+/) { return ''; } + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my @whichfoils=@{ $Apache::response::foilgroup{'names'} }; + my %responsehash; + $responsehash{$whichfoils[$response]}=$response; + my $responsestr=&Apache::lonnet::hash2str(%responsehash); + $Apache::lonhomework::results{"resource.$part.$id.submission"}= + $responsestr; + my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); + my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + &Apache::response::handle_previous(\%previous,$ad); + &Apache::lonxml::debug("submitted a $response
\n"); + return ''; +} + +sub grade_response { + my ($max,$randomize)=@_; + #keep the random numbers the same must always call this + my ($answer,@whichfoils)=&whichfoils($max,$randomize); + if ( !&Apache::response::submitted() ) { return; } + my $response; + if ($env{'form.submitted'} eq 'scantron') { + $response=&Apache::response::getresponse(); + } else { + $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']}; + } + if ( $response !~ /[0-9]+/) { return; } + my $part=$Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my %responsehash; + $responsehash{$whichfoils[$response]}=$response; + my $responsestr=&Apache::lonnet::hash2str(%responsehash); + my %previous=&Apache::response::check_for_previous($responsestr, + $part,$id); + $Apache::lonhomework::results{"resource.$part.$id.submission"}= + $responsestr; + &Apache::lonxml::debug("submitted a $response
\n"); + my $ad; + if ($response == $answer) { + $ad='EXACT_ANS'; + } else { + $ad='INCORRECT'; + } + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + &Apache::response::handle_previous(\%previous,$ad); } -#FIXME needs to stablely do random picks sub end_foilgroup { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - my $name; - my $result; - my @names = @{ $Apache::response::foilgroup{'names'} }; - my @truelist; - my @falselist; - my $rndseed=&Apache::lonnet::rndseed(); - $rndseed=$rndseed - +&Apache::lonnet::numval($Apache::inputtags::part) - +&Apache::lonnet::numval($Apache::inputtags::response['-1']); - srand($rndseed*10); - foreach $name (@names) { - $result.="
$name is $Apache::response::foilgroup{$name.'.value'} "; - if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { - push (@truelist,$name); - } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { - push (@falselist,$name); - } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + my $result; + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + my $style = $Apache::lonhomework::type; + my $direction = &Apache::lonxml::get_param('direction',$parstack, + $safeeval,'-2'); + if ( $style eq 'survey' && $target ne 'analyze') { + if ($target eq 'web' || $target eq 'tex') { + $result=&displayallfoils($direction); + } elsif ( $target eq 'answer' ) { + $result=&displayallanswers(); + } elsif ( $target eq 'grade' ) { + $result=&storesurvey(); + } + } else { + my $name; + my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval, + '-2'); + my $randomize = &Apache::lonxml::get_param('randomize',$parstack, + $safeeval,'-2'); + if ($target eq 'web' || $target eq 'tex') { + $result=&displayfoils($target,$max,$randomize,$direction); + } elsif ($target eq 'answer' ) { + $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']); + my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + push (@{ $Apache::lonhomework::analyze{"$part_id.options"} }, + ('true','false')); + } + } + } + &Apache::response::poprandomnumber(); + &Apache::lonxml::increment_counter(); + return $result; +} + +sub getfoilcounts { + my @names; + my $truecnt=0; + my $falsecnt=0; + my $name; + if ( $Apache::response::foilgroup{'names'} ) { + @names= @{ $Apache::response::foilgroup{'names'} }; + } + foreach $name (@names) { + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + $truecnt++; + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { + $falsecnt++; + } + } + return ($truecnt,$falsecnt); +} + +sub displayallfoils { + my ($direction)=@_; + my $result; + &Apache::lonxml::debug("survey style display"); + my @names; + if ( $Apache::response::foilgroup{'names'} ) { + @names= @{ $Apache::response::foilgroup{'names'} }; + } + my $temp=0; + my $id=$Apache::inputtags::response['-1']; + my $part=$Apache::inputtags::part; + my $lastresponse= + $Apache::lonhomework::history{"resource.$part.$id.submission"}; + if ($direction eq 'horizontal') { $result.=''; } + my %lastresponse=&Apache::lonnet::str2hash($lastresponse); + if (&Apache::response::show_answer() ) { + foreach my $name (@names) { + if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { + if ($direction eq 'horizontal') { + $result.=""; } + } + } + } else { + foreach my $name (@names) { + if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { + if ($direction eq 'horizontal') { + $result.=""; } + } + } + } + if ($direction eq 'horizontal') { $result.='
"; + } else { + $result.="
"; + } + if (defined($lastresponse{$name})) { + $result.=''; + } + $result .= $Apache::response::foilgroup{$name.'.text'}; + if (defined($lastresponse{$name})) { + $result.=''; + } + if ($direction eq 'horizontal') { $result.="		"; + } else { + $result.="
"; + } + $result .= '
'; } + return $result; +} + +sub whichfoils { + my ($max,$randomize)=@_; + + my @truelist; + my @falselist; + my @whichfalse =(); + my ($truecnt,$falsecnt) = &getfoilcounts(); + my $count=0; + # we will add in 1 of the true statements + if ( $max>0 && ($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; $max=$count; } + my $answer=int(&Math::Random::random_uniform() * ($count)); + &Apache::lonxml::debug("Count is $count, $answer is $answer"); + my @names; + if ( $Apache::response::foilgroup{'names'} ) { + @names= @{ $Apache::response::foilgroup{'names'} }; + } + if (&Apache::response::showallfoils()) { + @whichfalse=@names; + } elsif ($randomize eq 'no') { + &Apache::lonxml::debug("No randomization"); + my $havetrue=0; + foreach my $name (@names) { + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + if (!$havetrue ) { + push(@whichfalse,$name); $havetrue++; $answer=$#whichfalse; + } + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { + push (@whichfalse,$name); + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') { + } else { + &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in ",'<>&"')); + } + } + if (!$havetrue && $Apache::lonhomework::type ne 'survey') { + &Apache::lonxml::error("There are no true statements available.
"); + } } else { - &Apache::lonxml::error("Unknow state $Apache::response::foilgroup{$name.'.value'} for $name in "); + my $current=0; + &Apache::lonhomework::showhash(%Apache::response::foilgroup); + my (%top,%bottom); + #first find out where everyone wants to be + foreach my $name (@names) { + $current++; + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + push (@truelist,$name); + if ($Apache::response::foilgroup{$name.'.location'} eq 'top') { + $top{$name}=$current; + } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') { + $bottom{$name}=$current; + } + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { + push (@falselist,$name); + if ($Apache::response::foilgroup{$name.'.location'} eq 'top') { + $top{$name}=$current; + } elsif ($Apache::response::foilgroup{$name.'.location'} eq 'bottom') { + $bottom{$name}=$current; + } + } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') { + } else { + &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in ",'<>&"')); + } + } + #pick a true statement + my $notrue=0; + if (scalar(@truelist) == 0) { $notrue=1; } + my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1)); + &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue"); + my (@toplist, @bottomlist); + my $topcount=0; + my $bottomcount=0; + # assign everyone to either toplist/bottomlist or whichfalse + # which false is randomized, toplist bottomlist are in order + while ((($#whichfalse+$topcount+$bottomcount) < $max-2) && ($#falselist > -1)) { + &Apache::lonxml::debug("Have $#whichfalse max is $max"); + my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1)); + &Apache::lonxml::debug("From $#falselist elms, picking $afalse"); + $afalse=splice(@falselist,$afalse,1); + &Apache::lonxml::debug("Picked $afalse"); + &Apache::lonhomework::showhash(('names'=>\@names)); + &Apache::lonhomework::showhash(%top); + if ($top{$afalse}) { + $toplist[$top{$afalse}]=$afalse; + $topcount++; + } elsif ($bottom{$afalse}) { + $bottomlist[$bottom{$afalse}]=$afalse; + $bottomcount++; + } else { + push (@whichfalse,$afalse); + } + } + &Apache::lonxml::debug("Answer wants $answer"); + my $truename=$truelist[$whichtrue]; + my $dosplice=1; + if ($notrue && $Apache::lonhomework::type ne 'survey') { + $dosplice=0; + &Apache::lonxml::error("There are no true statements available.
"); + } + #insert the true statement, keeping track of where it wants to be + if ($Apache::response::foilgroup{$truename.'.location'} eq 'top' && $dosplice) { + $toplist[$top{$truename}]=$truename; + $answer=-1; + foreach my $top (reverse(@toplist)) { + if ($top) { $answer++;} + if ($top eq $truename) { last; } + } + $dosplice=0; + } elsif ($Apache::response::foilgroup{$truename.'.location'} eq 'bottom' && $dosplice) { + $bottomlist[$bottom{$truename}]=$truename; + $answer=-1; + foreach my $bot (@bottomlist) { + if ($bot) { $answer++;} + if ($bot eq $truename) { last; } + } + $answer+=$topcount+$#whichfalse+1; + $dosplice=0; + } else { + if ($topcount>0 || $bottomcount>0) { + $answer = int(&Math::Random::random_uniform() * ($#whichfalse+1)) + + $topcount; + } + } + &Apache::lonxml::debug("Answer now wants $answer"); + #add the top items to the top, bottom items to the bottom + for (my $i=0;$i<=$#toplist;$i++) { + if ($toplist[$i]) { unshift(@whichfalse,$toplist[$i]) } + } + for (my $i=0;$i<=$#bottomlist;$i++) { + if ($bottomlist[$i]) { push(@whichfalse,$bottomlist[$i]) } + } + #if the true statement is randomized insert it into the list + if ($dosplice) { splice(@whichfalse,$answer,0,$truelist[$whichtrue]); } } - } - my $rrargs =''; - if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; } - my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval); - my $whichtrue = rand $#truelist; - &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue"); - my @whichfalse =(); - my $temp=0; - while ((($#whichfalse+2) < $max) && ($#falselist > -1)) { - my $afalse=rand $#falselist; - &Apache::lonxml::debug("From $#falselist elms, picking $afalse"); - $afalse=splice(@falselist,$afalse,1); - &Apache::lonxml::debug("Picked $afalse"); - push (@whichfalse,$afalse); - } - my $where = rand $max; - splice(@whichfalse,$where,0,$truelist[$whichtrue]); - my $temp; - foreach $temp (@whichfalse) { - $result.=''.$Apache::response::foilgroup{$temp.'.text'}."
\n"; - } - return $result; + &Apache::lonxml::debug("Answer is $answer"); + return ($answer,@whichfalse); +} + +sub displayfoils { + my ($target,$max,$randomize,$direction)=@_; + my $result; + + my ($answer,@whichfoils)=&whichfoils($max,$randomize); + my $part=$Apache::inputtags::part; + my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; + if ( ($target ne 'tex') && + &Apache::response::show_answer() ) { + if ($direction eq 'horizontal') { + if ($target ne 'tex') { + $result.=''; + } + } + foreach my $name (@whichfoils) { + if ($direction eq 'horizontal') { + if ($target ne 'tex') { $result.=''; } + } + } + if ($direction eq 'horizontal') { + if ($target ne 'tex') { + $result.='
'; } + } + if ($target ne 'tex') { + $result.="
"; + } else { + $result.='\item \vskip -2 mm '; + } + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: \textbf{';} + } else { + $result.='Incorrect:'; + } + if ($target eq 'web') { $result.=""; } + if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { + if ($target ne 'tex') { $result.='';} else {$result.='}';} + } + if ($direction eq 'horizontal') { + if ($target ne 'tex') { $result.='
'; + } + } + } else { + my @alphabet = ('A'..'Z'); + my $i = 0; + my $temp=0; + 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); + if ($target ne 'tex' && $direction eq 'horizontal') { + $result.=""; + } + foreach my $name (@whichfoils) { + if ($target ne 'tex') { + if ($direction eq 'horizontal') { + $result.=""; + } + $temp++; + } + if ($target ne 'tex' && $direction eq 'horizontal') { + $result.="
"; + } else { + $result.="
"; + } + } + if ($target ne 'tex') { + $result.= '
"; + } + } + if ($target ne 'tex') { if ($direction ne 'horizontal') { $result.="
";} } else { $result.='\vskip 0 mm '; } + return $result; +} + +sub displayallanswers { + my @names; + if ( $Apache::response::foilgroup{'names'} ) { + @names= @{ $Apache::response::foilgroup{'names'} }; + } + + my $result=&Apache::response::answer_header('radiobuttonresponse'); + foreach my $name (@names) { + $result.=&Apache::response::answer_part('radiobuttonresponse', + $Apache::response::foilgroup{$name.'.value'}); + } + $result.=&Apache::response::answer_footer('radiobuttonresponse'); + return $result; +} + +sub displayanswers { + my ($max,$randomize)=@_; + my ($answer,@whichopt) = &whichfoils($max,$randomize); + my $result=&Apache::response::answer_header('radiobuttonresponse'); + if ($Apache::lonhomework::type eq 'exam') { + my $correct = ('A'..'Z')[$answer]; + $result.=&Apache::response::answer_part('radiobuttonresponse', + $correct); + } + foreach my $name (@whichopt) { + $result.=&Apache::response::answer_part('radiobuttonresponse', + $Apache::response::foilgroup{$name.'.value'}); + } + $result.=&Apache::response::answer_footer('radiobuttonresponse'); + return $result; +} + +sub start_conceptgroup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + $Apache::radiobuttonresponse::conceptgroup=1; + %Apache::response::conceptgroup=(); + my $result; + if ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50'). + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'concept'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_conceptgroup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + $Apache::radiobuttonresponse::conceptgroup=0; + my $result; + 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::radiobutton, + $parstack,$safeeval); + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); + } + return $result; +} + +sub insert_conceptgroup { + my $result="\n\t\t".&insert_foil()."\n\t\t\n"; + return $result; } sub start_foil { - &Apache::lonxml::debug("redirection be $Apache::lonxml::redirection"); - $Apache::lonxml::redirection--; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + 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); + $result.=&Apache::edit::text_arg('Name:','name',$token); + $result.=&Apache::edit::select_or_text_arg('Correct Option:','value', + ['unused','true','false'], + $token); + my $randomize=&Apache::lonxml::get_param('randomize',$parstack, + $safeeval,'-3'); + if ($randomize ne 'no') { + $result.=&Apache::edit::select_arg('Location:','location', + ['random','top','bottom'],$token); + } + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'value','name', + 'location'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } + return $result; } sub end_foil { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - if ($target eq 'web' || $target eq 'grade') { - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); - push @{ $Apache::response::foilgroup{'names'} }, $name; - my $value = &Apache::run::run("{$args;".'return $value}',$safeeval); - $Apache::response::foilgroup{"$name.value"} = $value; - $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack; - } - - $Apache::lonxml::redirection++; - &Apache::lonxml::debug("redirection is $Apache::lonxml::redirection"); - if ($Apache::lonxml::redirection == 1) { - &Apache::lonxml::debug("reset $Apache::lonxml::outputstack"); - $Apache::lonxml::outputstack=''; - } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $text=''; + 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') { + my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); + if ($value ne 'unused') { + my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq "") { + &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); + $name=$Apache::lonxml::curdepth; + } + 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::radiobuttonresponse::conceptgroup + && !&Apache::response::showallfoils() ) { + push @{ $Apache::response::conceptgroup{'names'} }, $name; + $Apache::response::conceptgroup{"$name.value"} = $value; + $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; + $Apache::response::foilgroup{"$name.text"} = $text; + $Apache::response::foilgroup{"$name.location"} = $location; + } + } + } + return ''; } +sub insert_foil { + return ' + + + +'; +} 1; __END__