--- loncom/homework/structuretags.pm	2000/08/03 19:34:11	1.2
+++ loncom/homework/structuretags.pm	2000/08/25 14:40:47	1.5
@@ -1,14 +1,13 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 
-
 package Apache::structuretags; 
 
 use strict;
 use Apache::lonnet;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::structuretags',('block'));
+  &Apache::lonxml::register('Apache::structuretags',('block','while'));
 }
 
 sub start_block {
@@ -17,9 +16,12 @@ sub start_block {
   my $code = @$parstack[$#$parstack];
   $code =~ s/\"//g;
   $code .=';return $condition;';
+#  print "<br>$code<br>";
   my $result = &Apache::run::run($code,$safeeval);
   if ( ! $result ) { 
-    my $skip=$$parser[$#$parser]->get_text("/block");
+#    my $skip=$$parser[$#$parser]->get_text("/block");
+    my $skip=&Apache::lonxml::get_all_text("block",$$parser[$#$parser]);
+#    print "skipped $skip";
   }
   return "";
 }
@@ -27,5 +29,36 @@ sub start_block {
 sub end_block {
 }
 
+sub start_while {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+
+  my $code = @$parstack[$#$parstack];
+  $code =~ s/\"//g;
+  $code .=';return $condition;';
+
+  push( @Apache::structuretags::whileconds, $code); 
+  my $result = &Apache::run::run($code,$safeeval);
+  my $bodytext=$$parser[$#$parser]->get_text("/while");
+  push( @Apache::structuretags::whilebody, $bodytext);
+  if ( $result ) { 
+     my $tempparser=HTML::TokeParser->new(\$bodytext);
+     push (@$parser,$tempparser);
+  }
+
+  return "";
+}
+
+sub end_while {
+  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;
 __END__