--- loncom/homework/structuretags.pm 2002/12/05 22:59:37 1.142
+++ loncom/homework/structuretags.pm 2003/02/14 21:22:04 1.148
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.142 2002/12/05 22:59:37 albertel Exp $
+# $Id: structuretags.pm,v 1.148 2003/02/14 21:22:04 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='';
+ $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target);
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
my ($symb)=&Apache::lonxml::whichuser();
if ($symb eq '') {
@@ -122,7 +123,6 @@ sub page_start {
sub get_resource_name {
my ($parstack,$safeeval)=@_;
my $name=&Apache::lonnet::gettitle();
- &Apache::lonnet::logthis("Got $name");
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
if ($name eq 'con_lost') { $name = ''; }
@@ -246,7 +246,7 @@ sub start_problem {
# won't get reset
if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
&Apache::lonxml::error('Only one problem allowed in a .problem file');
- my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
+ my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
return '';
}
#intialize globals
@@ -412,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' &&
@@ -451,6 +451,10 @@ sub end_problem {
&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;
@@ -523,7 +527,7 @@ sub start_block {
$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='';
@@ -586,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;
@@ -671,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' ) {
@@ -726,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 '';
@@ -740,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';
@@ -759,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 '';
@@ -774,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 '';
@@ -796,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)
@@ -807,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') {
@@ -832,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");
|