--- loncom/homework/structuretags.pm 2002/11/03 19:16:19 1.130
+++ loncom/homework/structuretags.pm 2002/11/06 22:58:36 1.131
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.130 2002/11/03 19:16:19 www Exp $
+# $Id: structuretags.pm,v 1.131 2002/11/06 22:58:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -481,21 +481,37 @@ sub end_library {
}
sub start_block {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+
+ my $result;
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
- my $code = @$parstack[$#$parstack];
- $code =~ s/\"//g;
- $code .=';return $condition;';
- # print "
$code
";
- my $result = &Apache::run::run($code,$safeeval);
- &Apache::lonxml::debug("block :$code: returned :$result:");
- if ( ! $result ) {
- my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
- &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ my $code = @$parstack[$#$parstack];
+ if ($code) {
+ $code =~ s/\"//g;
+ $code .=';return $condition;';
+ $result = &Apache::run::run($code,$safeeval);
+ &Apache::lonxml::debug("block :$code: returned :$result:");
+ } else {
+ $result='1';
+ }
+ if ( ! $result ) {
+ my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]);
+ &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+ }
+ $result='';
+ } elsif ($target eq 'edit') {
+ $result .=&Apache::edit::tag_start($target,$token);
+ $result .=&Apache::edit::text_arg('Test Condition:','condition',
+ $token,40);
+ $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'condition');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
- }
- return "";
+ return $result;
}
sub end_block {