--- loncom/homework/structuretags.pm 2003/10/14 00:21:12 1.217
+++ loncom/homework/structuretags.pm 2004/03/02 20:59:25 1.243
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.217 2003/10/14 00:21:12 albertel Exp $
+# $Id: structuretags.pm,v 1.243 2004/03/02 20:59:25 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,7 @@ use Apache::lonnet;
use Apache::File();
use Apache::lonmenu;
use Apache::lonlocal;
+use Apache::lonxml;
BEGIN {
&Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
@@ -84,10 +85,7 @@ sub page_start {
if (!defined($found{'html'})) {
$result=&Apache::londefdef::start_html($target,$token,$tagstack,
$parstack,$parser,$safeeval);
- $head_tag_start='
';
- if ($ENV{'request.state'} eq 'published') {
- $head_tag_start.=&Apache::lonmenu::registerurl(undef,$target);
- }
+ $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target);
}
my $body_tag_start;
if (!defined($found{'body'})) {
@@ -160,8 +158,8 @@ sub setup_rndseed {
$rndseed=$Apache::lonhomework::history{'rndseed'};
if (!$rndseed) {
$rndseed=time;
- $ENV{'form.rndseed'}=$rndseed;
}
+ $ENV{'form.rndseed'}=$rndseed;
}
if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
$ENV{'form.newrandomization'} eq &mt('New Randomization')) {
@@ -174,8 +172,10 @@ sub setup_rndseed {
if (defined($rndseed) && $rndseed ne int($rndseed)) {
$rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
}
- &Apache::lonxml::debug("Setting rndseed to $rndseed");
- &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+ if ($safeeval) {
+ &Apache::lonxml::debug("Setting rndseed to $rndseed");
+ &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+ }
}
return $rndseed;
}
@@ -183,12 +183,16 @@ sub setup_rndseed {
sub problem_edit_header {
return '
-
-
-
-
-