--- loncom/homework/structuretags.pm 2002/08/26 20:29:30 1.106
+++ loncom/homework/structuretags.pm 2002/12/05 14:37:17 1.141
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.106 2002/08/26 20:29:30 sakharuk Exp $
+# $Id: structuretags.pm,v 1.141 2002/12/05 14:37:17 matthew 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'})) {
@@ -109,10 +118,12 @@ sub page_start {
return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
}
+#use Time::HiRes();
sub get_resource_name {
my ($parstack,$safeeval)=@_;
- my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
- if ($name eq '') {
+ 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 = ''; }
}
@@ -129,6 +140,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 +152,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; - if ($target eq 'tex') { - $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; - if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\end{document} '; - } else { - $result .= '} '; - } - } + 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') { @@ -424,15 +426,15 @@ sub end_problem { $result.=" |