--- loncom/homework/optionresponse.pm	2001/05/04 21:19:37	1.6
+++ loncom/homework/optionresponse.pm	2002/11/07 16:45:55	1.58
@@ -1,198 +1,623 @@
-# The LearningOnline Network with CAPA
+# LearningOnline Network with CAPA
 # option list style responses
+#
+# $Id: optionresponse.pm,v 1.58 2002/11/07 16:45:55 sakharuk 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/
+#
 # 2/21 Guy
+# 01/18 Alex
 package Apache::optionresponse;
 use strict;
 use Apache::response;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
 }
 
 sub start_optionresponse {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  #when in a radiobutton response use these
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+  #when in a option response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+  push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
-  return '';
+  %Apache::hint::option=();
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::start_table($token).
+	"<tr><td>Multiple Option Response Question</td><td>Delete:".
+	&Apache::edit::deletelist($target,$token)
+	."</td><td>&nbsp;".
+        &Apache::edit::end_row().
+        &Apache::edit::start_spanning_row().
+        "\n";
+    $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::end_row().&Apache::edit::start_spanning_row();
+  } elsif ($target eq 'modified') {
+    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						 $safeeval,'max','randomize');
+    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  } elsif ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('optionresponse');
+  } elsif ($target eq 'analyze') {
+    my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+  }
+  return $result;
 }
 
 sub end_optionresponse {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
-  return '';
+  pop @Apache::lonxml::namespace;
+  &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+  my $result;
+  if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+  return $result;
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
 sub start_foilgroup {
-  %Apache::response::foilgroup={};
-  $Apache::optionresponse::conceptgroup=0;  
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+  my $result='';
+  %Apache::response::foilgroup=();
+  $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
-  return '';
+  if ($target eq 'edit') {
+    my $optionlist="<option></option>\n";
+    my $option;
+    my @opt;
+    eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
+    my $count=1;
+    foreach $option (@opt) {
+      $optionlist.="<option value=\"$count\">$option</option>\n";
+      $count++;
+    }
+    my $insertlist=&Apache::edit::insertlist($target,$token);
+    $result.=&Apache::edit::start_table($token);
+    $result.= (<<ENDTABLE);
+      <tr><td>Select Options</td>
+        <td>
+	  Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
+        </td>
+        <td>Delete an Option:
+	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
+ENDTABLE
+    $result.= &Apache::edit::end_row();
+    $result.= &Apache::edit::start_spanning_row();
+    $result.= $insertlist.'<br />';
+  }
+  if ($target eq 'modified') {
+    my @options;
+    my $optchanged=0;
+    eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
+      my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
+      &Apache::lonxml::debug("Deleting :$delopt:");
+      splice(@options,$delopt-1,1);
+      $optchanged=1;
+    }
+    if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
+      my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
+      if ($options[0]) {
+	push(@options,$newopt);
+      } else {
+	$options[0]=$newopt;
+      }
+      $optchanged=1;
+    }
+    if ($optchanged) {
+      $result = "<foilgroup options=\"(";
+      foreach my $option (@options) {
+	$option=~s/\'/\\\'/g;
+	&Apache::lonxml::debug("adding option :$option:");
+	$result .="'".$option."',";
+      }
+      chop $result;
+      $result.=')">';
+    } # else nothing changed so just use the default mechanism
+  }
+  if ($target eq 'tex') {
+      $result .= ' \begin{enumerate} ';
+  }
+  return $result;
 }
 
 sub end_foilgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
-  if ($target ne 'meta') {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
     my $name;
-    my ($count,$max) = &getfoilcounts($parstack,$safeeval);
-    if ($count>$max) { $count=$max } 
-    &Apache::lonxml::debug("Count is $count from $max");
-    my $args ='';
-    if ( $#$parstack > 0 ) { $args=$$parstack['-1']; }
     my @opt;
-    eval '@opt ='.&Apache::run::run("{$args;".'return $options}',$safeeval);
-    if ($target eq 'web') {
-      $result=&displayfoils($count,@opt);
+    eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    &Apache::lonxml::debug("Options are $#opt");
+    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,@opt);
+    } elsif ( $target eq 'answer') {
+      $result.=&displayanswers($max,$randomize,@opt);
+    } elsif ( $target eq 'analyze') {
+      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
+	if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
+	push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
+	$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
+	  $Apache::response::foilgroup{"$name.value"};
+	$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+	  $Apache::response::foilgroup{"$name.text"};
+      }
+      push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
+      push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
     } elsif ( $target eq 'grade') {
       if ( defined $ENV{'form.submitted'}) {
-	my @whichopt = &whichfoils($count);
+	my @whichopt = &whichfoils($max,$randomize);
 	my $temp=1;my $name;
-	my $allresponse;
+	my %responsehash;
+	my %grade;
 	my $right=0;
 	my $wrong=0;
+	my $ignored=0;
 	foreach $name (@whichopt) {
 	  my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
-	  $allresponse.="$response:";
+	  $responsehash{$name}=$response;
 	  if ( $response =~ /[^\s]/) {
-	    &Apache::lonxml::debug("submitted a $response<br />\n");
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
-	    if ($value eq $response) {$right++;} else {$wrong++;}
+	    &Apache::lonxml::debug("submitted a $response for $value<br />\n");
+	    if ($value eq $response) {
+		$grade{$name}='1'; $right++;
+	    } else {
+		$grade{$name}='0'; $wrong++;
+	    }
+	  } else {
+	    $ignored++;
 	  }
 	  $temp++;
 	}
+	my $part=$Apache::inputtags::part;
 	my $id = $Apache::inputtags::response['-1'];
-	$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$allresponse;
-	&Apache::lonxml::debug("Got $right right and $wrong wrong");
-	if ($wrong==0) {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='EXACT_ANS';
+	my $responsestr=&Apache::lonnet::hash2str(%responsehash);
+	my $gradestr   =&Apache::lonnet::hash2str(%grade);
+	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 {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}='INCORRECT';
+	  if ($ignored==0) {
+	    $ad='INCORRECT';
+	  } else {
+	    $ad='MISSING_ANSWER';
+	  }
 	}
+	$Apache::lonhomework::results{"resource.$part.$id.submission"}=
+	  $responsestr;
+	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
+	$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=
+	  $ad;
+	&Apache::response::handle_previous(\%previous,$ad);
       }
     }
-  }
+  } elsif ($target eq 'edit') {
+    $result.=&Apache::edit::end_table();
+  }  
+  if ($target eq 'tex') {$result .= '\end{enumerate}';}
   return $result;
 }
 
 sub getfoilcounts {
-  my ($parstack,$safeeval)=@_;
-  my $rrargs ='';
-  if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
-  my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
-  my $count = $#{ $Apache::response::foilgroup{'names'} };
-  return ($count,$max);
+  my ($max)=@_;
+  # +1 since instructors will count from 1
+  my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+  if (&Apache::response::showallfoils()) { $max=$count; }
+  if ($count>$max) { $count=$max } 
+  &Apache::lonxml::debug("Count is $count from $max");
+  return $count;
 }
 
 sub whichfoils {
-  my ($max)=@_;
+  my ($max,$randomize)=@_;
+  $max = &getfoilcounts($max);
+  &Apache::lonxml::debug("randomize $randomize");
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();
-  while ((($#whichopt) < $max) && ($#names > -1)) {
-    my $aopt=int rand $#names;
+  my (%top,@toplist,%bottom,@bottomlist);
+  if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) {
+      my $current=0;
+      foreach my $name (@names) {
+	  $current++;
+	  if ($Apache::response::foilgroup{$name.'.location'} eq 'top') {
+	      $top{$name}=$current;
+	  } elsif ($Apache::response::foilgroup{$name.'.location'} eq
+		   'bottom') {
+	      $bottom{$name}=$current;
+	  }
+      }
+  }
+  while ((($#whichopt+1) < $max) && ($#names > -1)) {
+    &Apache::lonxml::debug("Have $#whichopt max is $max");
+    my $aopt;
+    if (&Apache::response::showallfoils() || ($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");
-    push (@whichopt,$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 displayanswers {
+  my ($max,$randomize,@opt)=@_;
+  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my @whichopt = &whichfoils($max,$randomize);
+  my $result=&Apache::response::answer_header('optionresponse');
+  foreach my $name (@whichopt) {
+    $result.=&Apache::response::answer_part('optionresponse',
+		     $Apache::response::foilgroup{$name.'.value'})
+  }
+  $result.=&Apache::response::answer_footer('optionresponse');
+  return $result;
+}
+
 sub displayfoils {
-  my ($max,@opt)=@_;
+  my ($target,$max,$randomize,@opt)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
   my @falselist;
   my $result;
   my $name;
-  my @whichopt = &whichfoils($max);
-  my $optionlist="<option></option>\n";
-  my $option;
-  foreach $option (@opt) {
-    $optionlist.="<option>$option</option>\n";
-  }
-  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+  my $displayoptionintex=0;
+  my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
+		  'Q','R','S','T','U','V','W','X','Y','Z');
+  my @whichopt = &whichfoils($max,$randomize);
+  my $part=$Apache::inputtags::part;
+  my $id=$Apache::inputtags::response[-1];
+  if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {    
+    my $temp=1; ####
     foreach $name (@whichopt) {
-      $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
-	":".$Apache::response::foilgroup{$name.'.text'}."\n";
+      if ($target eq 'web') {
+	  $result.="<br />";
+      } elsif ($target eq 'tex') {
+	  $result.='\vskip 0 mm ';
+      }
+      if ($target ne 'tex') {
+	  $result .=$Apache::response::foilgroup{$name.'.value'}.
+	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+      } else {
+	  $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
+ 	  $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
+	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+      }
+      if ($Apache::lonhomework::type eq 'exam') {
+	if ($target ne 'tex') {
+	  $result.=&webbubbles(\@opt,\@alphabet);
+        } else {
+	  $result.=&bubbles(\@alphabet,\@opt);
+        }
+      }
+    $temp++;
     }
   } else {
     my $temp=1;
+    my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
     foreach $name (@whichopt) {
-      $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
-	.$optionlist
-	  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
-      $temp++;
+      my $lastopt=$lastresponse{$name};
+      my $optionlist="<option></option>\n";
+      my $option;
+      foreach $option (@opt) {
+	if ($option eq $lastopt) {
+	  $optionlist.="<option selected=\"on\">$option</option>\n";
+	} else {
+	  $optionlist.="<option>$option</option>\n";
+	}
+      }
+      if ($target ne 'tex') {
+	  $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
+	      .$optionlist
+		  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+	  if ($Apache::lonhomework::type eq 'exam') {
+	    $result.=&webbubbles(\@opt,\@alphabet);
+	  }
+	  $temp++;
+      } else {
+	  if ($displayoptionintex == 0) {
+              my $texoptionlist = &optionlist_correction($optionlist);
+	      if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';}
+	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+		  if ($Apache::lonhomework::type eq 'exam') {
+		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+		  }
+		  $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
+	      } else {
+		  if ($Apache::lonhomework::type eq 'exam') {
+		      $result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+		  } else {
+		      $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
+		  }
+	      }
+	      if ($Apache::lonhomework::type eq 'exam') {
+		  $result.=&bubbles(\@alphabet,\@opt);
+	      }
+	      $displayoptionintex=1;
+	  } else {
+	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+		  if ($Apache::lonhomework::type eq 'exam') {
+		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+		  }
+		  $result.= $Apache::response::foilgroup{$name.'.text'};
+	      } else {
+		  if ($Apache::lonhomework::type eq 'exam') {
+		      $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+		  } else {
+		      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+		  }
+	      }
+	      if ($Apache::lonhomework::type eq 'exam') {
+		  $result.=&bubbles(\@alphabet,\@opt);
+	      }
+	  }
+      } 
     }
+  } 
+  if ($target ne 'tex') {
+      return $result."<br />";
   }
-  return $result."<br />";
+  else {
+      return $result;
+  }
+}
+
+
+sub optionlist_correction {
+
+    my $texoptionlist = shift;
+    $texoptionlist =~ s/<option><\/option>/\\item \[\] Possible answers are:/;
+    $texoptionlist =~ s/<option>/\{\\bf /g;
+    $texoptionlist =~ s/<option selected="on">/\{\\bf /g;
+    $texoptionlist =~ s/<\/option>/\},/g;
+    $texoptionlist =~ s/,$/\./g;
+    $texoptionlist =~ s/>/\$>\$/g;
+    $texoptionlist =~ s/</\$<\$/g;
+    $texoptionlist =~ s/=/\$=\$/g;
+    return $texoptionlist;
+}
+
+
+sub webbubbles {
+
+    my ($ropt,$ralphabet)=@_;
+    my @opt=@$ropt; 
+    my @alphabet=@$ralphabet;
+    my $result='';
+	my $number_of_bubbles = $#opt + 1;
+	$result.= '<table border="1"><tr>';
+	for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
+	   $result.='<td>'.$alphabet[$ind].': '.$opt[$ind].'</td>';
+	}
+	$result.='</tr></table>';
+	return $result;
+}
+
+
+sub bubbles {
+
+    my ($ralphabit,$ropt) = @_;
+    my @alphabet = @$ralphabit;
+    my @opt = @$ropt;
+    my ($result,$head,$line) =('','','');
+    my $number_of_bubbles = $#opt + 1;
+    my $current_length = 0;
+    for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
+	$current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
+	if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
+	    $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
+	    $head.='lr';
+	} else {
+	    $line=~s/\&\s*$//;
+	    $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
+	    $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
+	    $head ='lr';
+	    $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
+	}
+
+    }
+    &Apache::lonxml::increment_counter();
+    return $result;
 }
 
 
 sub start_conceptgroup {
-  $Apache::optionresponse::conceptgroup=1;  
-  %Apache::response::conceptgroup={};
-  return '';
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::optionresponse::conceptgroup=1;
+  %Apache::response::conceptgroup=();
+  my $result;
+  if ($target eq 'edit') {
+    $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
+    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+  }
+  if ($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,$parstack,$parser,$safeeval,$style)=@_;
-  $Apache::optionresponse::conceptgroup=0;  
-  if ($target eq 'web' || $target eq 'grade') {
-    my @names = @{ $Apache::response::conceptgroup{'names'} };
-    my $pick=int rand $#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"};
-    my $args;
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
-    $Apache::response::foilgroup{"$name.concept"} = $concept;
-    &Apache::lonxml::debug("Selecting $name in $concept");
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::optionresponse::conceptgroup=0;
+  my $result='';
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
+      || $target eq 'tex' || $target eq 'analyze') {
+    #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 'analyze') {
+	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+        push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
+	      $concept);
+	$Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
+	  $Apache::response::conceptgroup{'names'};
+	foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
+	  push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
+		$name);
+	  $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
+	    $Apache::response::conceptgroup{"$name.value"};
+	  $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+	    $Apache::response::conceptgroup{"$name.text"};
+	  $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
+	    $Apache::response::conceptgroup{"$name.location"};
+	}
+      } elsif ($target eq 'web') {
+	  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	  push(@{ $Apache::hint::option{"$part_id.concepts"} },
+	       $concept);
+	  $Apache::hint::option{"$part_id.concept.$concept"}=
+	      $Apache::response::conceptgroup{'names'};
+      }
+    }
+  } elsif ($target eq 'edit') {
+    $result=&Apache::edit::end_table();
   }
-  return '';
+  return $result;
+}
+
+sub insert_conceptgroup {
+  my $result="\n\t\t<conceptgroup concept=\"\">".&insert_foil()."\n\t\t</conceptgroup>\n";
+  return $result;
 }
 
 sub start_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') { &Apache::lonxml::startredirection; }
-  return '';
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
+    &Apache::lonxml::startredirection;
+  } elsif ($target eq 'edit') {
+    $result=&Apache::edit::tag_start($target,$token,"Foil");
+    my $level='-2';
+    if ($$tagstack['-2'] eq 'conceptgroup') { $level = '-3'; }
+    my @opt;
+    eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
+    $result.=&Apache::edit::text_arg('Name:','name',$token);
+    $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',
+					       ['unused',(@opt)],$token,'15');
+    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)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';
-  if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade') {
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $value = &Apache::run::run("{$args;".'return $value}',$safeeval);
+  my $result = '';
+  if ($target eq 'web' || $target eq 'tex') { 
+      $text=&Apache::lonxml::endredirection;
+      if ($target eq 'tex') { $text = '\vspace*{-2 mm}\item '.$text; }
+  }
+  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::run::run("{$args;".'return $name}',$safeeval);
-      if ( $Apache::optionresponse::conceptgroup ) {
+      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; }
+      &Apache::lonxml::debug("Using a name of :$name:");
+      if ( $Apache::optionresponse::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.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;
       }
     }
   }
   if ($target eq 'edit') {
-    my $args ='';
-    if ( $#$parstack > 1 ) { $args=$$parstack['-2']; }
-    my $options=&Apache::run::run("{$args;".'return $options}',$safeeval);
-    if (!$options && $#$parstack > 2 ) { $args=$$parstack['-2']; }
-    my @opt;
-    #eval '@opt ='.
+    $result.= &Apache::edit::tag_end($target,$token,'');
   }
-  return '';
+  return $result;
 }
 
+sub insert_foil {
+  return '
+<foil name="" value="unused">
+<startouttext />
+<endouttext />
+</foil>';
+}
 1;
 __END__