--- loncom/homework/structuretags.pm 2000/09/18 15:43:38 1.7
+++ loncom/homework/structuretags.pm 2000/10/12 20:36:05 1.10
@@ -6,7 +6,45 @@ use strict;
use Apache::lonnet;
sub BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist'));
+ &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','outtext','web','tex'));
+}
+
+sub start_outtext {
+}
+
+sub end_outtext {
+}
+
+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);
+ return "$name\n\n"
+}
+
+sub end_problem {
+ return "\n";
}
sub start_block {
@@ -19,7 +57,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 +78,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 +89,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,7 +102,7 @@ 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;
@@ -77,7 +113,7 @@ sub start_randomlist {
# 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);
+ $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
$list_item = "$b_tok->[4]"."$list_item"."[1]>";
push(@randomlist,$list_item);
# print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item";
@@ -96,8 +132,8 @@ sub start_randomlist {
for(0 .. $#randomlist) {
$bodytext .= "$randomlist[ $idx_arr[$_] ]";
}
- my $tempparser=HTML::TokeParser->new(\$bodytext);
- push (@$parser,$tempparser);
+
+ &Apache::lonxml::newparser($parser,\$bodytext);
return "";
}