--- loncom/homework/structuretags.pm	2000/08/22 16:19:26	1.4
+++ loncom/homework/structuretags.pm	2000/08/25 14:40:47	1.5
@@ -1,7 +1,6 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 
-
 package Apache::structuretags; 
 
 use strict;
@@ -37,24 +36,28 @@ sub start_while {
   $code =~ s/\"//g;
   $code .=';return $condition;';
 
-  print "<H2>WHILE CONDITION = [$code]</H2>";
+  push( @Apache::structuretags::whileconds, $code); 
   my $result = &Apache::run::run($code,$safeeval);
   my $bodytext=$$parser[$#$parser]->get_text("/while");
-  if ( $result ) { # condition is TRUE, bodytext is evaluated
-# push the bodytext into parser stack
+  push( @Apache::structuretags::whilebody, $bodytext);
+  if ( $result ) { 
      my $tempparser=HTML::TokeParser->new(\$bodytext);
      push (@$parser,$tempparser);
-  } else { # condition is FALSE initially, skip bodytext
   }
+
   return "";
 }
 
 sub end_while {
-# pop parser from parser stack
-# check if condition is TRUE, 
-#   TRUE  then push content into parser stack
-#   FALSE then continue
-
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $code = pop @Apache::structuretags::whileconds;
+  my $bodytext = pop @Apache::structuretags::whilebody;
+  my $result = &Apache::run::run($code,$safeeval);
+  if ( $result ) { 
+     my $tempparser=HTML::TokeParser->new(\$bodytext);
+     push (@$parser,$tempparser);
+  } 
+  return "";
 }
 
 1;