--- loncom/homework/structuretags.pm 2004/08/29 07:51:22 1.260.2.4
+++ loncom/homework/structuretags.pm 2004/09/09 08:59:56 1.267
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.260.2.4 2004/08/29 07:51:22 albertel Exp $
+# $Id: structuretags.pm,v 1.267 2004/09/09 08:59:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,7 +36,7 @@ use Apache::File();
use Apache::lonmenu;
use Apache::lonlocal;
use Apache::lonxml;
-
+use Time::HiRes qw( gettimeofday tv_interval );
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
}
@@ -61,7 +61,7 @@ sub start_tex {
if ($target eq 'tex') {
return $bodytext.' ';
}
- return $result;
+ return $result;;
}
sub end_tex {
@@ -83,7 +83,8 @@ sub page_start {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,
$parstack,$parser,$safeeval);
$head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target).
- &Apache::lonhtmlcommon::htmlareaheaders();
+ &Apache::lonhtmlcommon::htmlareaheaders().
+ &Apache::lonhtmlcommon::spellheader();
}
my $body_tag_start;
if (!defined($found{'body'})) {
@@ -395,12 +396,14 @@ sub set_problem_state {
sub get_problem_status {
my ($part)=@_;
- my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
- &Apache::lonxml::debug("problem status for $part is $problem_status");
- &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+ my $problem_status;
if ($ENV{'request.state'} eq 'construct' &&
defined($ENV{'form.problemstatus'})) {
$problem_status=$ENV{'form.problemstatus'};
+ } else {
+ $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+ &Apache::lonxml::debug("problem status for $part is $problem_status");
+ &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
}
return $problem_status;
}
@@ -484,7 +487,16 @@ sub start_problem {
''.
'
';
+ value="'.$ENV{'form.username'}.'" />';
+ if ($ENV{'user.adv'}) {
+ $form_tag_start.=
+ ' //;
- }
- $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= $endminipage.'\end{document} ';
} else {
- $result .= '';
+ $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= $endminipage.'\end{document} ';
+ } else {
+ $result .= '';
+ }
}
}
}