--- loncom/homework/structuretags.pm 2005/03/17 13:56:32 1.282
+++ loncom/homework/structuretags.pm 2005/11/04 15:34:32 1.315
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.282 2005/03/17 13:56:32 albertel Exp $
+# $Id: structuretags.pm,v 1.315 2005/11/04 15:34:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -68,6 +68,33 @@ sub end_tex {
return '';
}
+sub body_tag_start {
+ my ($target,$background,$bgcolor)=@_;
+ my $body_tag_start='
'.&Apache::lonmenu::menubuttons(undef,$target,1);
+
+ &Apache::lontexconvert::jsMath_reset();
+ if ($env{'environment.texengine'} eq 'jsMath') {
+ $body_tag_start.=&Apache::lontexconvert::jsMath_header();
+ }
+ return $body_tag_start;
+}
+
sub page_start {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my %found;
@@ -88,40 +115,20 @@ sub page_start {
&Apache::lonxml::fontsettings();
}
my $body_tag_start;
- if (!defined($found{'body'}) && $ENV{'request.state'} eq 'construct'
- && $ENV{'environment.remote'} eq 'off') {
- $body_tag_start=&Apache::loncommon::bodytag();
- $body_tag_start.=&Apache::lonxml::message_location();
+ if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
+ && $env{'environment.remote'} eq 'off') {
+ if ($target eq 'web' || $target eq 'edit') {
+ $body_tag_start=&Apache::loncommon::bodytag();
+ $body_tag_start.=&Apache::lonxml::message_location();
+ }
} elsif (!defined($found{'body'})) {
- $body_tag_start=''.&Apache::lonmenu::menubuttons(undef,$target,1);
- if ($ENV{'environment.texengine'} eq 'jsMath') {
- $body_tag_start.=''."\n".
- ''."\n";
- }
- if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
+ my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
+ $safeeval);
+ $body_tag_start=&body_tag_start($target,$background,$bgcolor);
+ if ( ($target eq 'web' || $target eq 'webgrade')
+ && $env{'request.state'} ne 'construct') {
my ($symb,undef,undef,undef,$publicuser)=
&Apache::lonxml::whichuser();
if ($symb eq '' && !$publicuser) {
@@ -135,8 +142,8 @@ sub page_start {
my $form_tag_start;
if (!defined($found{'form'})) {
$form_tag_start='";
$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
}
@@ -677,15 +775,15 @@ sub end_problem {
$result.=&Apache::lonxml::xmlend().'';
} elsif ($target eq 'tex') {
my $endminipage = '';
- if (not $ENV{'form.problem_split'}=~/yes/) {
+ if (not $env{'form.problem_split'}=~/yes/) {
$endminipage = '\end{minipage}';
}
- if ($ENV{'form.print_discussions'} eq 'yes') {
+ if ($env{'form.print_discussions'} eq 'yes') {
$result.=&Apache::lonxml::xmlend($target,$parser);
$result=~s/<\/html>//;
} else {
$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
- if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ if (not $env{'request.symb'} =~ m/\.page_/) {
$result .= $endminipage.'\end{document} ';
} else {
$result .= '';
@@ -697,9 +795,10 @@ sub end_problem {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&finalize_storage();
}
- if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')
- && $ENV{'form.answer_output_mode'} ne 'tex') {
- $result.=''; # normally we get it from xmlend, but in CSTR
+ if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
+ && $env{'form.answer_output_mode'} ne 'tex') {
+ $result.=&Apache::lonxml::xmlend().'';
+ # normally we get it from above, but in CSTR
# we always show answer mode too.
}
} elsif ($target eq 'meta') {
@@ -711,10 +810,10 @@ sub end_problem {
$result.=&Apache::response::meta_response_order();
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
- $result = &problem_edit_footer();
+ $result .= &problem_edit_footer();
}
- if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
+ if ($env{'request.state'} eq 'construct' && $target eq 'web') {
&Apache::inputtags::check_for_duplicate_ids();
}
@@ -742,7 +841,7 @@ sub start_library {
$result=$token->[4];
$result.=&Apache::edit::handle_insert();
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
- $ENV{'request.state'} eq "construct" ) {
+ $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);
@@ -761,7 +860,7 @@ sub end_library {
if ($target eq 'edit') {
$result=&problem_edit_footer();
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
- $ENV{'request.state'} eq "construct") {
+ $env{'request.state'} eq "construct") {
$result.=''.&Apache::loncommon::endbodytag().
&Apache::lonxml::xmlend();
}
@@ -897,8 +996,8 @@ sub start_instructorcomment {
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
- if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) {
+ $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
+ if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
$parser,$style);
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
@@ -994,7 +1093,9 @@ sub start_randomlist {
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
$target eq 'tex' || $target eq 'analyze') {
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
- my $b_parser= HTML::TokeParser->new(\$body);
+ my $b_parser= HTML::LCParser->new(\$body);
+ $b_parser->xml_mode(1);
+ $b_parser->marked_sections(1);
my $b_tok;
my @randomlist;
my $list_item;
@@ -1018,17 +1119,19 @@ sub start_randomlist {
# print "END-TAG $b_tok->[1]
";
# }
}
- my @idx_arr = (0 .. $#randomlist);
- &Apache::structuretags::shuffle(\@idx_arr);
- my $bodytext = '';
- my $show=$#randomlist;
- my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
- $showarg--;
- if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
- for(0 .. $show) {
- $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+ if (@randomlist) {
+ my @idx_arr = (0 .. $#randomlist);
+ &Apache::structuretags::shuffle(\@idx_arr);
+ my $bodytext = '';
+ my $show=$#randomlist;
+ my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
+ $showarg--;
+ if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
+ for(0 .. $show) {
+ $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+ }
+ &Apache::lonxml::newparser($parser,\$bodytext);
}
- &Apache::lonxml::newparser($parser,\$bodytext);
} elsif ($target eq 'edit' ) {
$result .=&Apache::edit::tag_start($target,$token);
$result .=&Apache::edit::text_arg('Maximum Tags to Show:','show',
@@ -1045,7 +1148,7 @@ sub start_randomlist {
sub shuffle {
my $a=shift;
my $i;
- if (defined(@$a)) {
+ if (ref($a) eq 'ARRAY' && @$a) {
&Apache::response::pushrandomnumber();
for($i=@$a;--$i;) {
my $j=int(&Math::Random::random_uniform() * ($i+1));
@@ -1066,11 +1169,24 @@ sub end_randomlist {
return $result;
}
+sub ordered_show_check {
+ my $last_part=$Apache::inputtags::partlist[-2];
+ my $in_order=
+ &Apache::lonnet::EXT('resource.'.$Apache::inputtags::part.'.ordered');
+ my $in_order_show=1;
+ if ($last_part ne '0' && lc($in_order) eq 'yes') {
+ $in_order_show=&Apache::response::check_status($last_part);
+ }
+ return $in_order_show;
+}
+
sub start_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ &Apache::lonxml::startredirection(); # we'll use redirection to fix up
+ # duedates.
my $result='';
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
- if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+ if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;
push(@Apache::inputtags::partlist,$id);
@Apache::inputtags::response=();
@@ -1080,7 +1196,7 @@ sub start_part {
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
my $newtype=&Apache::lonnet::EXT("resource.$id.type");
if ($newtype) { $Apache::lonhomework::type=$newtype; }
-
+ my $in_order_show=&ordered_show_check();
my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
$expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
&Apache::run::run($expression,$safeeval);
@@ -1091,7 +1207,7 @@ sub start_part {
&Apache::response::meta_parameter_write('display','string',$display,'Part Description');
} elsif ($target eq 'web' || $target eq 'grade' ||
$target eq 'answer' || $target eq 'tex') {
- if ($hidden) {
+ if ($hidden || !$in_order_show) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
} else {
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
@@ -1099,7 +1215,7 @@ sub start_part {
my $expression='$external::datestatus="'.$status.'";';
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
&Apache::run::run($expression,$safeeval);
- if ($ENV{'request.state'} eq 'construct') {
+ if ($env{'request.state'} eq 'construct') {
&set_problem_state($Apache::inputtags::part);
}
if (( $status eq 'CLOSED' ) ||
@@ -1112,7 +1228,7 @@ sub start_part {
if ( $target eq "web" ) {
$result="
".&mt('Part is not open to be viewed. It')." $accessmsg
";
} elsif ( $target eq 'tex' ) {
- if (not $ENV{'form.problem_split'}=~/yes/) {
+ if (not $env{'form.problem_split'}=~/yes/) {
$result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}";
} else {
$result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";
@@ -1120,7 +1236,7 @@ sub start_part {
}
} else {
if ($target eq 'tex') {
- if (not $ENV{'form.problem_split'}=~/yes/) {
+ if (not $env{'form.problem_split'}=~/yes/) {
if ($$tagstack[-2] eq 'td') {
$result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
} else {
@@ -1128,7 +1244,7 @@ sub start_part {
}
}
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
- my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+ my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
my @allkeys = split /,/,$allkeys;
my $allow_print_points = 0;
foreach my $partial_key (@allkeys) {
@@ -1140,6 +1256,10 @@ sub start_part {
if (defined($maxtries) && $maxtries < 0) {
$allow_print_points=0;
}
+ if (lc($env{'course.'.$env{'request.course.id'}.
+ '.disableexampointprint'}) eq 'yes') {
+ $allow_print_points=0;
+ }
if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
} elsif ($target eq 'web') {
$result.='';
@@ -1171,30 +1291,31 @@ sub end_part {
&Apache::lonxml::debug("in end_part $target ");
my $status=$Apache::inputtags::status['-1'];
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
- my $result='';
- if ( $target eq 'meta' ) {
- $result='';
- } elsif ($target eq 'grade') {
+ my $in_order_show=&ordered_show_check();
+ my $result= &Apache::lonxml::endredirection(); # started in &start_part
+ if ($target eq 'grade') {
if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
- !$hidden) {
- $result=&Apache::inputtags::grade;
+ !$hidden && $in_order_show) {
+ $result.=&Apache::inputtags::grade;
} else {
# move any submission data to .hidden
&Apache::inputtags::hidealldata($Apache::inputtags::part);
}
- } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
+ } elsif (($target eq 'web' || $target eq 'tex') &&
+ !$hidden && $in_order_show) {
my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
$target);
if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
$gradestatus='';
}
- $result=$gradestatus;
+ $result.=$gradestatus;
if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';}
} elsif ($target eq 'edit') {
- $result=&Apache::edit::end_table();
+ $result.=&Apache::edit::end_table();
}
pop @Apache::inputtags::status;
$Apache::inputtags::part='';
+ $Apache::lonhomework::type = $Apache::lonhomework::default_type;
return $result;
}
@@ -1202,7 +1323,8 @@ sub start_preduedate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
- if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ if (!$Apache::lonhomework::scantronmode &&
+ $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER'));
&Apache::lonxml::get_all_text("/preduedate",$parser);
@@ -1218,7 +1340,8 @@ sub end_preduedate {
sub start_postanswerdate {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
if ($target eq 'web' || $target eq 'grade') {
- if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+ if ($Apache::lonhomework::scantronmode ||
+ $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
&Apache::lonxml::get_all_text("/postanswerdate",$parser);
}
} elsif ($target eq 'tex') {
@@ -1377,10 +1500,10 @@ sub delete_startouttext {
sub start_simpleeditbutton {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
- if (($ENV{'form.simple_edit_button'} ne 'off') &&
+ if (($env{'form.simple_edit_button'} ne 'off') &&
($target eq 'web') &&
- (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
- my $url=$ENV{'request.noversionuri'};
+ (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+ my $url=$env{'request.noversionuri'};
$url=~s/\?.*$//;
my ($symb) = &Apache::lonxml::whichuser();
$result='