--- loncom/homework/structuretags.pm 2003/05/27 18:58:51 1.178
+++ loncom/homework/structuretags.pm 2003/07/25 10:44:36 1.199
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.178 2003/05/27 18:58:51 sakharuk Exp $
+# $Id: structuretags.pm,v 1.199 2003/07/25 10:44:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,14 +38,15 @@ use Apache::File();
use Apache::lonmenu;
BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+ &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
+'simpleeditbutton','definetag'));
}
sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
- if ($target eq 'web') {
- return $bodytext;
+ if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
+ $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
}
return '';
}
@@ -56,11 +57,15 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
- if ($target eq 'tex') {
- return $bodytext.' ';
+ my $result='';
+ if (!($target eq 'edit' || $target eq 'modified' ||
+ $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+ &Apache::lonxml::debug("tex 1");
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ } elsif ($target eq 'tex') {
+ $result=&Apache::lonxml::get_all_text("/tex",$parser);
}
- return '';
+ return $result;;
}
sub end_tex {
@@ -89,6 +94,7 @@ sub page_start {
'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
my $background=&Apache::lonxml::get_param('background',$parstack,
$safeeval);
+ if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }
if ($background) {
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$background;
@@ -96,12 +102,15 @@ sub page_start {
} else {
my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
$safeeval);
- if ($bgcolor) {
+ if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {
$body_tag_start.='bgcolor="'.$bgcolor.'" ';
} else {
$body_tag_start.='bgcolor="#ffffff"';
}
}
+ if ($ENV{'browser.fontenhance'} eq 'on') {
+ $body_tag_start.=' style="font-size: x-large;" ';
+ }
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
my ($symb,undef,undef,undef,$publicuser)=
@@ -148,13 +157,15 @@ sub setup_rndseed {
}
if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
$ENV{'form.newrandomization'} eq 'New Randomization') {
- $rndseed=time;
- if ($rndseed eq $ENV{'form.rndseed'}) {
- srand($rndseed);
- $rndseed=int(rand(1000000000));
- }
+ srand(time);
+ $rndseed=int(rand(2100000000));
$ENV{'form.rndseed'}=$rndseed;
+ delete($ENV{'form.resetdata'});
+ delete($ENV{'form.newrandomization'});
}
+ 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);
}
@@ -263,15 +274,14 @@ ENDCHECKOUT
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- $Apache::lonhomework::parsing_a_problem=1;
- # meta is called from lonpublisher, which doesn't uses the normal
- # lonhomework method of parsing the file which means that inputtags
- # 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);
+ if ( $Apache::inputtags::part ne '' ||
+ $Apache::lonhomework::parsing_a_problem) {
+ &Apache::lonxml::error('Only one <problem> allowed in a .problem file');
+ #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
return '';
}
+
+ $Apache::lonhomework::parsing_a_problem=1;
#initialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::partlist=('0');
@@ -345,7 +355,7 @@ sub start_problem {
''.
'';
+ value="'.$ENV{'form.username'}.'" />
';
}
($status,$accessmsg) = &Apache::lonhomework::check_access('0');
push (@Apache::inputtags::status,$status);
@@ -388,7 +398,7 @@ sub start_problem {
$body_tag_start \n $form_tag_start".
'';
if ($ENV{'request.state'} eq "construct") {
- $result.= &problem_web_to_edit_header($rndseed);
+ $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
}
# if we are viewing someone else preserve that info
if (defined $ENV{'form.grade_symb'}) {
@@ -404,7 +414,7 @@ sub start_problem {
}
} elsif ($target eq 'tex') {
my $startminipage = '';
- if ($ENV{'form.problem_split'} ne 'yes') {
+ if (not $ENV{'form.problem_split'}=~/yes/) {
$startminipage = '\begin{minipage}{\textwidth}';
}
my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
@@ -502,7 +512,8 @@ sub end_problem {
}
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
$status eq 'UNCHECKEDOUT' ) {
- if ($target ne 'tex') {
+ if ($target ne 'tex' &&
+ $ENV{'form.answer_output_mode'} ne 'tex') {
$result.="