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

version 1.8, 2000/10/05 19:26:16 version 1.9, 2000/10/11 21:03:27
Line 6  use strict; Line 6  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist'));    &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem'));
   }
   
   sub start_problem {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my $args ='';
     if ( $#$parstack > -1 ) {
       $args=$$parstack[$#$parstack];
     }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
     return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n"
   }
   
   sub end_problem {
     return "</body>\n";
 }  }
   
 sub start_block {  sub start_block {
Line 19  sub start_block { Line 33  sub start_block {
   my $result = &Apache::run::run($code,$safeeval);    my $result = &Apache::run::run($code,$safeeval);
   if ( ! $result ) {     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]);      my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
 #    print "skipped $skip";  #    print "skipped $skip";
   }    }
   return "";    return "";
Line 64  sub end_while { Line 78  sub end_while {
 # </randomlist>  # </randomlist>
 sub start_randomlist {  sub start_randomlist {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $body= &Apache::lonxml::get_all_text("randomlist",$$parser[$#$parser]);    my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
   my $b_parser= HTML::TokeParser->new(\$body);    my $b_parser= HTML::TokeParser->new(\$body);
   my $b_tok;    my $b_tok;
   my @randomlist;    my @randomlist;
Line 75  sub start_randomlist { Line 89  sub start_randomlist {
     # get content of the tag until matching end tag      # get content of the tag until matching end tag
     # 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);
       $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";        $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
       push(@randomlist,$list_item);        push(@randomlist,$list_item);
    #  print "<BR><B>START-TAG $b_tok->[1], $b_tok->[4], $list_item</B>";     #  print "<BR><B>START-TAG $b_tok->[1], $b_tok->[4], $list_item</B>";

Removed from v.1.8  
changed lines
  Added in v.1.9


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