--- loncom/homework/optionresponse.pm	2001/02/19 20:36:26	1.3
+++ loncom/homework/optionresponse.pm	2001/02/22 00:49:03	1.4
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # option list style responses
-
+# 2/21 Guy
 package Apache::optionresponse;
 use strict;
 
@@ -145,14 +145,14 @@ sub end_conceptgroup {
 
 sub start_foil {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') { 
-    $Apache::lonxml::redirection--; 
-  }
+  if ($target eq 'web') { &Apache::lonxml::startredirection; }
   return '';
 }
 
 sub end_foil {
   my ($target,$token,$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]; }
@@ -161,13 +161,7 @@ sub end_foil {
       my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
       push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.value"} = $value;
-      $Apache::response::foilgroup{"$name.text"} = $Apache::lonxml::outputstack;
-    }
-  }
-  if ($target eq 'web' ) {
-    $Apache::lonxml::redirection++;
-    if ($Apache::lonxml::redirection == 1) { 
-      $Apache::lonxml::outputstack=''; 
+      $Apache::response::foilgroup{"$name.text"} = $text;
     }
   }
   return '';