--- loncom/homework/structuretags.pm 2003/07/17 18:42:13 1.198
+++ loncom/homework/structuretags.pm 2004/05/27 04:32:19 1.251
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.198 2003/07/17 18:42:13 sakharuk Exp $
+# $Id: structuretags.pm,v 1.251 2004/05/27 04:32:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,17 +36,18 @@ use strict;
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',
-'simpleeditbutton','definetag'));
+ &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
}
sub start_web {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- 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);
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+ if ($target eq 'web') {
+ return $bodytext;
}
return '';
}
@@ -58,12 +59,9 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
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);
+ my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ if ($target eq 'tex') {
+ return $bodytext.' ';
}
return $result;;
}
@@ -75,7 +73,7 @@ sub end_tex {
sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my %found;
- foreach my $taginside ($tagstack) {
+ foreach my $taginside (@$tagstack) {
foreach my $taglookedfor ('html','body','form') {
if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;}
}
@@ -94,6 +92,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;
@@ -101,22 +100,26 @@ 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)=
&Apache::lonxml::whichuser();
if ($symb eq '' && !$publicuser) {
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
- $help="Browsing resource, all submissions are temporary.
";
+ $help=&mt("Browsing resource, all submissions are temporary.")."
";
$body_tag_start.=$help;
}
}
+ $body_tag_start.=&Apache::lonxml::message_location();
}
my $form_tag_start;
if (!defined($found{'form'})) {
@@ -129,11 +132,18 @@ sub page_start {
#use Time::HiRes();
sub get_resource_name {
my ($parstack,$safeeval)=@_;
+ if (defined($Apache::lonhomework::name)) {
+ return $Apache::lonhomework::name;
+ }
my $name=&Apache::lonnet::gettitle();
if ($name eq '') {
$name=&Apache::lonnet::EXT('resource.title');
if ($name eq 'con_lost') { $name = ''; }
}
+ if ($name!~/\S+/) {
+ $name=$ENV{'request.uri'};
+ $name=~s-.*/([^/]+)$-$1-;
+ }
$Apache::lonhomework::name=$name;
return $name;
}
@@ -142,17 +152,18 @@ sub setup_rndseed {
my ($safeeval)=@_;
my $rndseed;
my ($symb)=&Apache::lonxml::whichuser();
- if ($ENV{'request.state'} eq "construct" || $symb eq '') {
+ if ($ENV{'request.state'} eq "construct" || $symb eq '' ||
+ $Apache::lonhomework::history{'resource.CODE'}) {
$rndseed=$ENV{'form.rndseed'};
if (!$rndseed) {
$rndseed=$Apache::lonhomework::history{'rndseed'};
if (!$rndseed) {
$rndseed=time;
- $ENV{'form.rndseed'}=$rndseed;
}
+ $ENV{'form.rndseed'}=$rndseed;
}
- if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
- $ENV{'form.newrandomization'} eq 'New Randomization') {
+ if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
+ $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
srand(time);
$rndseed=int(rand(2100000000));
$ENV{'form.rndseed'}=$rndseed;
@@ -162,51 +173,103 @@ 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 ($Apache::lonhomework::history{'resource.CODE'}) {
+ $rndseed=&Apache::lonnet::rndseed();
+ }
+ if ($safeeval) {
+ &Apache::lonxml::debug("Setting rndseed to $rndseed");
+ &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
+ }
}
return $rndseed;
}
sub problem_edit_header {
return '
-
-
-
-
- ';
+
+
+
+ + +
- '; + return ' |
$lt{'id_expln'}
+ +$lt{'warning'}
ENDCHECKOUT } -sub start_problem { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; +sub init_problem_globals { + my ($type)=@_; + #initialize globals + if ($type eq 'problem') { + $Apache::inputtags::part='0'; + @Apache::inputtags::partlist=('0'); - 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::problemstatus=&get_problem_status('0') + } else { + $Apache::inputtags::part=''; + @Apache::inputtags::partlist=(); + $Apache::lonhomework::problemstatus=''; } - - $Apache::lonhomework::parsing_a_problem=1; -#initialize globals - $Apache::inputtags::part='0'; - @Apache::inputtags::partlist=('0'); @Apache::inputtags::responselist = (); @Apache::inputtags::importlist = (); @Apache::inputtags::previous=(); @@ -290,20 +356,70 @@ sub start_problem { @Apache::structuretags::whilebody=(); @Apache::structuretags::whileline=(); $Apache::lonhomework::scantronmode=0; - $Apache::lonhomework::problemstatus= - &Apache::lonnet::EXT('resource.0.problemstatus'); + undef($Apache::lonhomework::name); + +} + +sub reset_problem_globals { + my ($type)=@_; + undef(%Apache::lonhomework::history); + undef(%Apache::lonhomework::results); + undef($Apache::inputtags::part); +#don't undef this, lonhomework.pm takes care of this, we use this to +#detect if we try to do 2 problems in one file +# undef($Apache::lonhomework::parsing_a_problem); + undef($Apache::lonhomework::name); +} + +sub set_problem_state { + my ($part)=@_; + if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') { + $Apache::lonhomework::history{"resource.$part.solved"}= + 'correct_by_student'; + } +} + +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'}); + if ($ENV{'request.state'} eq 'construct' && + defined($ENV{'form.problemstatus'})) { + $problem_status=$ENV{'form.problemstatus'}; + } + return $problem_status; +} + +sub start_problem { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + + 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; + &init_problem_globals('problem'); if (defined($ENV{'scantron.maxquest'})) { $Apache::lonhomework::scantronmode=1; } + &initialize_storage(); if ($target ne 'analyze') { - &initialize_storage(); if ($target eq 'web') { &Apache::lonhomework::showhash(%Apache::lonhomework::history); } + if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); } $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); - &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); + if (($ENV{'request.state'} eq 'construct') && + defined($ENV{'form.problemtype'})) { + $Apache::lonhomework::type=$ENV{'form.problemtype'}; + } + &Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:"); } if ($Apache::lonhomework::type eq '' ) { my $uri=$ENV{'request.uri'}; @@ -317,7 +433,8 @@ sub start_problem { } #added vars to the scripting enviroment - my $expression='$external::part='.$Apache::inputtags::part.';'; + my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; + $expression.='$external::type=\''.$Apache::lonhomework::type.'\';'; &Apache::run::run($expression,$safeeval); my $status; my $accessmsg; @@ -349,7 +466,7 @@ sub start_problem { $form_tag_start.=''. ''. + value="'.&mt('New Problem Variation').'" />'. '