--- loncom/homework/structuretags.pm 2001/08/06 18:33:58 1.52
+++ loncom/homework/structuretags.pm 2001/08/17 16:50:04 1.57
@@ -2,6 +2,8 @@
# definition of tags that give a structure to a document
# 2/19 Guy
# 6/26/2001 fixed extra web display at end of tags
+# 8/17 Gerd Kortemeyer
+
package Apache::structuretags;
use strict;
@@ -71,30 +73,62 @@ sub start_problem {
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
if ($Apache::lonhomework::type eq '') {
- $Apache::lonhomework::type='homework';
+ my $uri=$ENV{'request.uri'};
+ if ($uri=~/\.(\w+)$/) {
+ $Apache::lonhomework::type=$1;
+ &Apache::lonxml::debug("Using type of $1");
+ } else {
+ $Apache::lonhomework::type='problem';
+ &Apache::lonxml::debug("Using default type, problem, :$uri:");
+ }
}
#adeed vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);
my $status;
- my $datemsg;
+ my $accessmsg;
#should get back a or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ if ($target eq 'web') {
+ if ($ENV{'form.doescheckout'}) {
+ $body_tag_start.=&Apache::lonxml::maketoken('web');
+ }
+ }
if ($target eq 'web' || $target eq 'grade') {
- ($status,$datemsg) = &Apache::lonhomework::check_date('0');
+ ($status,$accessmsg) = &Apache::lonhomework::check_access('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' ) {
+ if (( $status eq 'CLOSED' ) ||
+ ( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'BANNED')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
if ( $target eq "web" ) {
$result.= $head_tag_start.'';
- return $result . $body_tag_start .
- "
Problem is not open to be viewed. The problem $datemsg
";
+ my $msg=$body_tag_start.
+ 'Not open to be viewed
';
+ if ($status eq 'CLOSED') {
+ $msg.='The problem '.$accessmsg;
+ } elsif ($status eq 'UNCHECKEDOUT') {
+ $msg.=(<The resource needs to be checked out
+As a resource gets checked out, a unique timestamped ID is given to it, and a
+permanent record is left in the system.
+
+Checking out resources is subject to course policies, and may exclude future
+credit even if done erroneously.
+
+
+ENDCHECKOUT
+ }
+ return $result.$msg.'
';
}
}
}
@@ -327,7 +361,7 @@ sub start_part {
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
} elsif ($target eq 'web' || $target eq 'grade') {
- my ($status,$datemsg) = &Apache::lonhomework::check_date($id);
+ my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
@@ -335,7 +369,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 $accessmsg
";
}
}
}