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

version 1.6, 2000/09/14 15:41:32 version 1.18, 2000/12/01 00:44:48
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','web','tex','part'));
   }
   
   sub start_web {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
     return $bodytext;
   }
   
   sub end_web {
   }
   
   sub start_tex {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
     return '';
   }
   
   sub end_tex {
   }
   
   sub start_problem {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     unless ($target eq 'meta') {
       my $args ='';
       if ( $#$parstack > -1 ) {
         $args=$$parstack[$#$parstack];
       }
       my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
       $Apache::inputtags::part='0';
       @Apache::inputtags::responselist = ();
       my $expression='$external::part='.$Apache::inputtags::part.';';
       $safeeval->share_from('Apache::inputtags',['@part']);
       &Apache::run::run($expression,$safeeval);
       return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
     } 
   }
   
   sub end_problem {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my $result='';
     unless ($target eq 'meta') {
       if ( $target eq 'web' && $Apache::inputtags::part eq '0') {
         $result.=&Apache::inputtags::grade;
       }
       $result.="</form></body>\n";
     } else {
       if ($Apache::inputtags::part eq '0') {
         $result=&Apache::response::mandatory_part_meta;
       }
     }
     return $result;
 }  }
   
 sub start_block {  sub start_block {
Line 19  sub start_block { Line 70  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 40  sub start_while { Line 91  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 102  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 66  sub end_while { Line 115  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;
   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
     # 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);
       $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 139  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 {
 }  }
   
   sub start_part {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
     $Apache::inputtags::part=$id;
     @Apache::inputtags::responselist = ();
     if ($target eq 'meta') {
       return &Apache::response::mandatory_part_meta;
     }
   }
   
   sub end_part {
     my ($target,$token,$parstack,$parser,$safeeval)=@_;
     &Apache::lonxml::debug("in end_part $target ");
     if ( $target eq 'meta' ) {
       return '';
     }
     my $result=&Apaceh::inputtags::grade;
     return $result;
   }
   
 1;  1;
 __END__  __END__

Removed from v.1.6  
changed lines
  Added in v.1.18


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