--- loncom/homework/structuretags.pm 2002/08/26 20:42:36 1.107
+++ loncom/homework/structuretags.pm 2002/11/13 23:37:56 1.137
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.107 2002/08/26 20:42:36 sakharuk Exp $
+# $Id: structuretags.pm,v 1.137 2002/11/13 23:37:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +29,7 @@
# 6/26/2001 fixed extra web display at end of
";
+ $body_tag_start.=$help;
+ }
+ }
}
my $form_tag_start;
if (!defined($found{'form'})) {
@@ -129,6 +138,7 @@ sub setup_rndseed {
$rndseed=time;
$ENV{'form.rndseed'}=$rndseed;
}
+ &Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
}
return $rndseed;
@@ -140,13 +150,13 @@ sub problem_edit_header {
';
}
sub problem_edit_footer {
- return ' + return ' |
]*)>//g;
- $gradesatement =~ s/<\/td>//g;
- $gradesatement =~ s//\\textbf{/g;
- $gradesatement =~ s/<\/b>/}/g;
- $gradesatement =~ s/ /\\vskip 0 mm /g; - $gradesatement =~ s/]*)>//g; - } - $result.= $gradesatement; + my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;} } if ( - (($target eq 'web' || $target eq 'tex') && ($ENV{'request.state'} ne 'construct')) || - ($target eq 'answer') + (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || + ($target eq 'answer') || ($target eq 'tex') ) { if ($status eq 'CAN_ANSWER') { if ($target ne 'tex') { @@ -421,9 +429,9 @@ sub end_problem { } else { $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\end{document} '; + $result .= '\end{minipage}\end{document} '; } else { - $result .= '} '; + $result .= ''; } } } @@ -442,11 +450,14 @@ sub end_problem { return $result; } + sub start_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= - &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + my ($result,$head_tag_start,$body_tag_start,$form_tag_start); + if ($target eq 'edit') { + ($result,$head_tag_start,$body_tag_start,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); $result.=$head_tag_start."".$body_tag_start.$form_tag_start. &problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); @@ -454,7 +465,10 @@ sub start_library { } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct" ) { + } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && + $ENV{'request.state'} eq "construct" ) { + ($result,$head_tag_start,$body_tag_start,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); my $name=&get_resource_name($parstack,$safeeval); my $rndseed=&setup_rndseed($safeeval); $result.="$head_tag_start |