--- loncom/homework/structuretags.pm 2000/09/14 15:41:32 1.6
+++ loncom/homework/structuretags.pm 2000/11/28 19:15:48 1.14
@@ -6,7 +6,43 @@ use strict;
use Apache::lonnet;
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)=@_;
+ my $args ='';
+ if ( $#$parstack > -1 ) {
+ $args=$$parstack[$#$parstack];
+ }
+ my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+ $Apache::inputtags::part='0';
+ my $expression='$external::part='.$Apache::inputtags::part.';';
+ $safeeval->share_from('Apache::inputtags',['@part']);
+ &Apache::run::run($expression)
+ return "
$name\n\n\n";
}
sub start_block {
@@ -19,7 +55,7 @@ sub start_block {
my $result = &Apache::run::run($code,$safeeval);
if ( ! $result ) {
# 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";
}
return "";
@@ -40,8 +76,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 +87,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 "";
}
@@ -66,26 +100,21 @@ sub end_while {
#
sub start_randomlist {
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_tok;
my @randomlist;
my $list_item;
- my $param;
while($b_tok = $b_parser->get_token() ) {
if($b_tok->[0] eq 'S') { # start tag
# get content of the tag until matching end tag
# 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 "START-TAG $b_tok->[1], $list_item
";
+ $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
+ $list_item = "$b_tok->[4]"."$list_item"."$b_tok->[1]>";
push(@randomlist,$list_item);
+ # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item";
}
if($b_tok->[0] eq 'T') { # text
# what to do with text in between tags?
@@ -95,19 +124,42 @@ sub start_randomlist {
# print "END-TAG $b_tok->[1]
";
# }
}
- # 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$bodytext
";
- 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 {
}
+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;
+}
+
+sub end_part {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ $Apache::inputtags::part='0';
+}
1;
__END__