[BACK]Return to structuretags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.6 and 1.8

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

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>