--- loncom/homework/structuretags.pm	2000/09/14 15:41:32	1.6
+++ loncom/homework/structuretags.pm	2000/10/05 19:26:16	1.8
@@ -40,8 +40,7 @@ sub start_while {
   my $bodytext=$$parser[$#$parser]->get_text("/while");
   push( @Apache::structuretags::whilebody, $bodytext);
   if ( $result ) { 
-     my $tempparser=HTML::TokeParser->new(\$bodytext);
-     push (@$parser,$tempparser);
+    &Apache::lonxml::newparser($parser,\$bodytext);
   }
   return "";
 }
@@ -52,8 +51,7 @@ sub end_while {
   my $bodytext = pop @Apache::structuretags::whilebody;
   my $result = &Apache::run::run($code,$safeeval);
   if ( $result ) { 
-     my $tempparser=HTML::TokeParser->new(\$bodytext);
-     push (@$parser,$tempparser);
+    &Apache::lonxml::newparser($parser,\$bodytext);
   } 
   return "";
 }
@@ -71,7 +69,6 @@ sub start_randomlist {
   my $b_tok;
   my @randomlist;
   my $list_item;
-  my $param;
 
   while($b_tok = $b_parser->get_token() ) {
     if($b_tok->[0] eq 'S') { # start tag
@@ -79,13 +76,9 @@ sub start_randomlist {
     # get all text upto the matching tag
     # and push the content into @randomlist
       $list_item = &Apache::lonxml::get_all_text($b_tok->[1],$b_parser);
-      $param='';
-      map {$param .= "$_=\"$b_tok->[2]->{$_}\" "} @{$b_tok->[3]};
-      $param=~ s/^\s*(\S+)\s*$/$1/;
-      $param= " $param" if $param ne "";
-      $list_item = "<$b_tok->[1]"."$param>"."$list_item"."</$b_tok->[1]>";
-      print "<B>START-TAG $b_tok->[1], $list_item</B><BR>";
+      $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
       push(@randomlist,$list_item);
+   #  print "<BR><B>START-TAG $b_tok->[1], $b_tok->[4], $list_item</B>";
     }
     if($b_tok->[0] eq 'T') { # text
     # what to do with text in between tags?
@@ -95,16 +88,27 @@ sub start_randomlist {
       #  print "<B>END-TAG $b_tok->[1]</B><BR>";
     # }
   }
-  # randomly select one item from the array @randomlist 
-  # and created a new parser for it and push it onto the
-  # parser stack
-  my $bodytext = $randomlist[int(rand($#randomlist - 1)) + 1];
-  my $tempparser=HTML::TokeParser->new(\$bodytext);
-  print "SELECT-BODY<B>$bodytext</B><BR>";
-  push (@$parser,$tempparser);
+  my @idx_arr = (0 .. $#randomlist);
+  &Apache::structuretags::shuffle(\@idx_arr);
+  my $bodytext = '';
+  for(0 .. $#randomlist) {
+    $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+  }
+
+  &Apache::lonxml::newparser($parser,\$bodytext);
   return "";
 }
 
+sub shuffle {
+    my $a=shift;
+    my $i;
+    for($i=@$a;--$i;) {
+      my $j=int rand($i+1);
+      next if $i == $j;
+      @$a[$i,$j] = @$a[$j,$i];
+    }
+}
+
 sub end_randomlist {
 }