--- loncom/homework/structuretags.pm 2000/12/29 21:54:06 1.25
+++ loncom/homework/structuretags.pm 2001/01/15 21:44:21 1.31
@@ -54,7 +54,7 @@ sub start_problem {
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
";
}
}
}
@@ -62,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";
}
}
@@ -231,17 +237,21 @@ 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 &Apache::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::lonxml::get_all_text("/pre_duedate",$$parser[$#$parser]);
+ if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
+ &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
}
}
return '';
@@ -255,7 +265,7 @@ 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("/post_answerdate",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
}
}
return '';
@@ -272,7 +282,7 @@ sub start_notsolved {
&Apache::lonxml::debug("not solved has :$gradestatus:");
if ($gradestatus =~ /^correct/) {
&Apache::lonxml::debug("skipping");
- &Apache::lonxml::get_all_text("/not_solved",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]);
}
}
return '';