--- loncom/homework/structuretags.pm 2002/11/12 05:05:27 1.136
+++ loncom/homework/structuretags.pm 2003/02/14 19:35:54 1.147
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.136 2002/11/12 05:05:27 albertel Exp $
+# $Id: structuretags.pm,v 1.147 2003/02/14 19:35:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -35,6 +35,7 @@ package Apache::structuretags;
use strict;
use Apache::lonnet;
use Apache::File();
+use Apache::lonmenu;
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
@@ -43,7 +44,7 @@ BEGIN {
sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
if ($target eq 'web') {
return $bodytext;
}
@@ -56,7 +57,7 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
if ($target eq 'tex') {
return $bodytext.' ';
}
@@ -81,12 +82,12 @@ sub page_start {
if (!defined($found{'html'})) {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
$parser,$safeeval);
- $head_tag_start='
'.&Apache::lonxml::registerurl(undef,$target);
+ $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target);
}
my $body_tag_start;
if (!defined($found{'body'})) {
- $body_tag_start='';
- my $msg=$body_tag_start.
- 'Not open to be viewed
';
+ my $msg=$body_tag_start;
+ if ($status eq 'UNAVAILABLE') {
+ $result.='Unable to determine if this resource is open due to network problems. Please try again later.
';
+ } else {
+ $result.='Not open to be viewed
';
+ }
if ($status eq 'CLOSED') {
$msg.='The problem '.$accessmsg;
} elsif ($status eq 'UNCHECKEDOUT') {
@@ -316,8 +323,13 @@ sub start_problem {
}
$result.=$msg.'
';
} elsif ($target eq 'tex') {
- $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
- }
+ $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm ";
+ if ($status eq 'UNAVAILABLE') {
+ $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm ';
+ } else {
+ $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
+ }
+ }
} elsif ($target eq 'web') {
my $name= &get_resource_name($parstack,$safeeval);
if ($status eq 'CAN_ANSWER') {
@@ -336,7 +348,7 @@ sub start_problem {
}
}
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
- || $status eq 'CLOSED') {
+ || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
$result.=$head_tag_start.
"$name\n$body_tag_start\n";
}
@@ -400,7 +412,7 @@ sub end_problem {
my $result='';
my $status=$Apache::inputtags::status['-1'];
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
- if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
+ if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && $status eq 'CAN_ANSWER' ) {
# if part is zero, no s existed, so we need to the grading
&Apache::inputtags::grade;
} elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' &&
@@ -424,21 +436,25 @@ sub end_problem {
$result.="\n";
}
}
- if ($target ne 'tex') {
+ if ($target eq 'web') {
$result.=&Apache::lonxml::xmlend();
- } else {
- $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\end{minipage}\end{document} ';
- } else {
- $result .= '';
- }
+ } elsif ($target eq 'tex') {
+ $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\end{minipage}\end{document} ';
+ } else {
+ $result .= '';
+ }
}
}
if ($target eq 'grade') {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&finalize_storage();
}
+ if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
+ $result.=''; #normally we get it from xmlend, but in CSTR
+ # we always show answer mode too.
+ }
} elsif ($target eq 'meta') {
if ($Apache::inputtags::part eq '0') {
$result=&Apache::response::mandatory_part_meta;
@@ -446,7 +462,7 @@ sub end_problem {
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result = &problem_edit_footer();
- }
+ }
return $result;
}
@@ -502,13 +518,16 @@ sub start_block {
if ($code) {
$code =~ s/\"//g;
$code .=';return $condition;';
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
$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]);
+ my $skip=&Apache::lonxml::get_all_text("/block",$parser);
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
}
$result='';
@@ -537,6 +556,9 @@ sub start_while {
$code .=';return $condition;';
push( @Apache::structuretags::whileconds, $code);
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
my $result = &Apache::run::run($code,$safeeval);
my $bodytext=$$parser[$#$parser]->get_text("/while");
push( @Apache::structuretags::whilebody, $bodytext);
@@ -568,7 +590,7 @@ sub start_randomlist {
my $result;
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
$target eq 'tex' || $target eq 'analyze') {
- my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
+ my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
my $b_parser= HTML::TokeParser->new(\$body);
my $b_tok;
my @randomlist;
@@ -653,7 +675,7 @@ sub start_part {
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
&Apache::run::run($expression,$safeeval);
if ( $status eq 'CLOSED' ) {
- my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
if ( $target eq "web" ) {
$result="
Part is not open to be viewed. It $accessmsg
";
} elsif ( $target eq 'tex' ) {
@@ -687,17 +709,19 @@ sub end_part {
my ($target,$token,$tagstack,$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' && $status eq 'CAN_ANSWER') {
- return &Apache::inputtags::grade;
- }
- if ($target eq 'web' || $target eq 'tex' ) {
- my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
+ my $result='';
+ if ( $target eq 'meta' ) {
+ $result='';
+ } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+ $result=&Apache::inputtags::grade;
+ } elsif ($target eq 'web' || $target eq 'tex' ) {
+ my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
+ $target);
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
- return $gradestatus;
+ $result=$gradestatus;
}
- return '';
+ pop @Apache::inputtags::status;
+ return $result;
}
sub start_preduedate {
@@ -706,7 +730,7 @@ sub start_preduedate {
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
- &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/preduedate",$parser);
}
}
return '';
@@ -720,7 +744,7 @@ sub start_postanswerdate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
- &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/postanswerdate",$parser);
}
} elsif ($target eq 'tex') {
return '\vskip 0 mm \noindent';
@@ -739,7 +763,7 @@ sub start_notsolved {
&Apache::lonxml::debug("not solved has :$gradestatus:");
if ($gradestatus =~ /^correct/) {
&Apache::lonxml::debug("skipping");
- &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/notsolved",$parser);
}
}
return '';
@@ -754,7 +778,7 @@ sub start_solved {
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
if ($gradestatus !~ /^correct/) {
- &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/solved",$parser);
}
}
return '';
@@ -776,7 +800,7 @@ sub end_startouttext {
my $text='';
if ($target eq 'edit') {
- $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]);
+ $text=&Apache::lonxml::get_all_text("endouttext",$parser);
$result.=&Apache::edit::start_table($token)."Text Block |
Delete:".
&Apache::edit::deletelist($target,$token)
@@ -787,7 +811,7 @@ sub end_startouttext {
&Apache::edit::editfield($token->[1],$text,"",80,4);
}
if ($target eq 'modified') {
- $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
+ $text=&Apache::lonxml::get_all_text("endouttext",$parser);
$result=''.&Apache::edit::modifiedfield();
}
if ($target eq 'tex') {
@@ -812,7 +836,7 @@ sub end_endouttext {
}
sub delete_startouttext {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
+# my $text=&Apache::lonxml::get_all_text("endouttext",$parser);
my $text=$$parser['-1']->get_text("/endouttext");
my $ntoken=$$parser['-1']->get_token();
&Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
|