--- loncom/homework/structuretags.pm 2000/12/19 23:22:22 1.23
+++ loncom/homework/structuretags.pm 2001/02/19 20:39:00 1.32
@@ -6,7 +6,7 @@ use strict;
use Apache::lonnet;
sub BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part'));
+ &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved'));
}
sub start_web {
@@ -48,10 +48,13 @@ sub start_problem {
if ($target ne 'meta') {
($status,$datemsg) = &Apache::lonhomework::check_date('0');
push (@Apache::inputtags::status,$status);
+ my $expression='$external::datestatus="'.$status.'";';
+ $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
+ &Apache::run::run($expression,$safeeval);
if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return "
Problem is not open to be viewed. The problem $datemsg
";
+ return "
Problem is not open to be viewed. The problem $datemsg
";
}
}
}
@@ -59,10 +62,15 @@ sub start_problem {
my $args ='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+ if ($name eq '') {
+ $name=&Apache::lonnet::EXT('resource.title');
+ if ($name eq 'con_lost') { $name = ''; }
+ }
+ $Apache::lonhomework::name=$name;
if ($status eq 'CAN_ANSWER') {
# create a page header and exit
- return "$name\n\n\n";
- } elsif ($status eq 'SHOW_ANSWER') {
+ } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
$result.="\n";
}
}
@@ -103,12 +112,12 @@ sub start_block {
my $code = @$parstack[$#$parstack];
$code =~ s/\"//g;
$code .=';return $condition;';
-# print "
$code
";
+# print "
$code
";
my $result = &Apache::run::run($code,$safeeval);
+ &Apache::lonxml::debug("block :$code: returned :$result:");
if ( ! $result ) {
-# my $skip=$$parser[$#$parser]->get_text("/block");
my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]);
-# print "skipped $skip";
+ &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]");
}
return "";
}
@@ -166,14 +175,14 @@ sub start_randomlist {
$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";
+ # 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?
- # print "TEXT $b_tok->[1]
";
+ # print "TEXT $b_tok->[1]
";
}
# if($b_tok->[0] eq 'E') { # end tag, should not happen
- # print "END-TAG $b_tok->[1]
";
+ # print "END-TAG $b_tok->[1]
";
# }
}
my @idx_arr = (0 .. $#randomlist);
@@ -218,7 +227,7 @@ sub start_part {
if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return "
Part is not open to be viewed. It $datemsg
";
+ return "
Part is not open to be viewed. It $datemsg
";
}
}
}
@@ -228,11 +237,74 @@ sub start_part {
sub end_part {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
&Apache::lonxml::debug("in end_part $target ");
+ my $status=$Apache::inputtags::status['-1'];
pop @Apache::inputtags::status;
if ( $target eq 'meta' ) { return ''; }
- if ( $target eq 'grade' ) { return &Apaceh::inputtags::grade; }
+ if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+ return &Apache::inputtags::grade;
+ }
return &Apache::inputtags::gradestatus($Apache::inputtags::part);
}
+sub start_preduedate {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ if ($target ne 'meta') {
+ if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
+ &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
+ }
+ }
+ return '';
+}
+
+sub end_preduedate {
+ return '';
+}
+
+sub start_postanswerdate {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ if ($target ne 'meta') {
+ if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+ &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
+ }
+ }
+ return '';
+}
+
+sub end_postanswerdate {
+ return '';
+}
+
+sub start_notsolved {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ if ($target ne 'meta') {
+ my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
+ &Apache::lonxml::debug("not solved has :$gradestatus:");
+ if ($gradestatus =~ /^correct/) {
+ &Apache::lonxml::debug("skipping");
+ &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]);
+ }
+ }
+ return '';
+}
+
+sub end_notsolved {
+ return '';
+}
+
+sub start_solved {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ if ($target ne 'meta') {
+ my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
+ if ($gradestatus !~ /^correct/) {
+ &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
+ }
+ }
+ return '';
+}
+
+sub end_solved {
+ return '';
+}
1;
__END__