--- loncom/homework/structuretags.pm 2003/10/03 15:27:02 1.212
+++ loncom/homework/structuretags.pm 2003/10/14 00:21:12 1.217
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.212 2003/10/03 15:27:02 albertel Exp $
+# $Id: structuretags.pm,v 1.217 2003/10/14 00:21:12 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -84,7 +84,10 @@ sub page_start {
if (!defined($found{'html'})) {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,
$parstack,$parser,$safeeval);
- $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target);
+ $head_tag_start='';
+ if ($ENV{'request.state'} eq 'published') {
+ $head_tag_start.=&Apache::lonmenu::registerurl(undef,$target);
+ }
}
my $body_tag_start;
if (!defined($found{'body'})) {
@@ -355,7 +358,7 @@ sub start_problem {
}
#added vars to the scripting enviroment
- my $expression='$external::part='.$Apache::inputtags::part.';';
+ my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
&Apache::run::run($expression,$safeeval);
my $status;
my $accessmsg;
@@ -400,7 +403,8 @@ sub start_problem {
if (( $status eq 'CLOSED' ) ||
( $status eq 'UNCHECKEDOUT') ||
( $status eq 'BANNED') ||
- ( $status eq 'UNAVAILABLE')) {
+ ( $status eq 'UNAVAILABLE') ||
+ ( $status eq 'INVALID_ACCESS')) {
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
if ( $target eq "web" ) {
$result.= $head_tag_start.'';
@@ -410,7 +414,7 @@ sub start_problem {
} else {
$result.=''.&mt('Not open to be viewed').'
';
}
- if ($status eq 'CLOSED') {
+ if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
$msg.='The problem '.$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
$msg.=&checkout_msg;
@@ -442,7 +446,8 @@ sub start_problem {
}
}
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
- || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
+ || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE' ||
+ $status eq 'INVALID_ACCESS') {
$result.=$head_tag_start.
"$name\n$body_tag_start\n";
}
@@ -539,7 +544,7 @@ sub end_problem {
$result.=" \n";
}
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
- $status eq 'UNCHECKEDOUT' ) {
+ $status eq 'UNCHECKEDOUT' || $status eq 'INVALID_ACCESS') {
if ($target ne 'tex' &&
$ENV{'form.answer_output_mode'} ne 'tex') {
$result.="\n";
@@ -574,6 +579,7 @@ sub end_problem {
@Apache::inputtags::response=();
$result=&Apache::response::mandatory_part_meta;
}
+ $result.=&Apache::response::meta_part_order();
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result = &problem_edit_footer();
@@ -939,7 +945,7 @@ sub start_part {
$Apache::lonhomework::problemstatus=
&Apache::lonnet::EXT("resource.$id.problemstatus");
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
- my $expression='$external::part='.$Apache::inputtags::part.';';
+ my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
&Apache::run::run($expression,$safeeval);
if ($target eq 'meta') {
@@ -954,7 +960,11 @@ sub start_part {
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
&Apache::run::run($expression,$safeeval);
- if ( $status eq 'CLOSED' ) {
+ if (( $status eq 'CLOSED' ) ||
+ ( $status eq 'UNCHECKEDOUT') ||
+ ( $status eq 'BANNED') ||
+ ( $status eq 'UNAVAILABLE') ||
+ ( $status eq 'INVALID_ACCESS')) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
if ( $target eq "web" ) {
$result="