--- loncom/homework/optionresponse.pm	2004/02/19 21:55:54	1.102
+++ loncom/homework/optionresponse.pm	2004/04/16 22:25:13	1.106
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.102 2004/02/19 21:55:54 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.106 2004/04/16 22:25:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,8 @@
 #
 package Apache::optionresponse;
 use strict;
-use Apache::response;
+use Apache::response();
+use Apache::lonlocal;
 
 BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
@@ -41,6 +42,7 @@ sub start_optionresponse {
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   %Apache::hint::option=();
+  undef(%Apache::response::foilnames);
   if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).
 	"<tr><td>Multiple Option Response Question ".
@@ -75,6 +77,7 @@ sub end_optionresponse {
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+  undef(%Apache::response::foilnames);
   return $result;
 }
 
@@ -281,6 +284,27 @@ sub displayanswers {
   return $result;
 }
 
+sub check_for_invalid {
+    my ($names,$options) = @_;
+    my %bad_names;
+    foreach my $name (@{ $names }) {
+	my $value=$Apache::response::foilgroup{$name.'.value'};
+	my $found=0;
+	foreach my $option (@{ $options }) {
+	    if ($value eq $option) { $found=1; }
+	}
+	if (!$found) { $bad_names{$name}=$value; }
+    }
+    if (%bad_names) {
+	my $error=&mt('The question can not be gotten correct, '.
+	    'the following foils in the &lt;optionresponse&gt; '.
+	    'have invalid correct options').' <br /><tt>'.
+	    join('<br />',(map { $_=&mt("[_1] with value [_2]",$_,$bad_names{$_}) } (keys(%bad_names)))).
+	    "</tt>";
+	&Apache::lonxml::error($error);
+    }
+}
+
 sub displayfoils {
   my ($target,$max,$randomize,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
@@ -292,6 +316,7 @@ sub displayfoils {
   my $displayoptionintex=1;
   my @alphabet = ('A'..'Z');
   my @whichopt = &whichfoils($max,$randomize);
+  &check_for_invalid(\@whichopt,\@opt);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
   my $break;
@@ -527,7 +552,10 @@ sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
-    &Apache::lonxml::startredirection;
+      &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';
@@ -565,10 +593,14 @@ sub end_foil {
     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; }
       &Apache::lonxml::debug("Using a name of :$name:");
+      if (defined($Apache::response::foilnames{$name})) {
+	  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> 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::optionresponse::conceptgroup
 	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;