--- loncom/homework/structuretags.pm 2005/04/18 21:10:41 1.285 +++ loncom/homework/structuretags.pm 2005/10/17 16:08:13 1.303.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.285 2005/04/18 21:10:41 raeburn Exp $ +# $Id: structuretags.pm,v 1.303.2.1 2005/10/17 16:08:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,6 +68,34 @@ sub end_tex { return ''; } +sub body_tag_start { + my ($target,$background,$bgcolor)=@_; + my $body_tag_start=''."\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) { @@ -321,8 +329,7 @@ sub initialize_storage { # if running user has student role. sub finalize_storage { my $result; - my ($temp) = keys %Apache::lonhomework::results; - if ( $temp ne '' ) { + if (%Apache::lonhomework::results) { my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); if ($env{'request.state'} eq 'construct' || $symb eq '') { $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'}; @@ -340,6 +347,7 @@ sub finalize_storage { } return $result; } +use Data::Dumper; # -------------------------------------------------------------store_aggregates # Sends hash of values to be incremented in nohist_resourcetracker.db @@ -347,24 +355,38 @@ sub finalize_storage { # and corrects for each part for an instance of a problem, as appropriate. sub store_aggregates { my ($symb,$courseid) = @_; - my %aggregate = (); - my @parts = (); - my ($cdomain,$cname) = split/_/,$courseid; - foreach my $key (keys %Apache::lonhomework::results) { - if ($key =~ /resource\.(\d+)\.tries/) { - push @parts, $1; + my %aggregate; + my @parts; + my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cname = $env{'course.'.$env{'request.course.id'}.'.num'}; + foreach my $key (keys(%Apache::lonhomework::results)) { + if ($key =~ /resource\.([^\.]+)\.tries/) { + push(@parts, $1); } } - foreach (@parts) { - if ($Apache::lonhomework::results{'resource.'.$_.'.award'} eq 'APPROX_ANS' || $Apache::lonhomework::results{'resource.'.$_.'.award'} eq 'EXACT_ANS') { - $aggregate{$symb.'_'.$_.'_correct'} = 1; + foreach my $part (@parts) { + if ($Apache::lonhomework::results{'resource.'.$part.'.award'} + eq 'APPROX_ANS' || + $Apache::lonhomework::results{'resource.'.$part.'.award'} + eq 'EXACT_ANS') { + $aggregate{$symb."\0".$part."\0correct"} = 1; } - if ($Apache::lonhomework::results{'resource.'.$_.'.tries'} == 1) { - $aggregate{$symb.'_'.$_.'_users'} = 1; + if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) { + $aggregate{$symb."\0".$part."\0users"} = 1; + } else { + my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]); + if ($last_reset) { + if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) { + $aggregate{$symb."\0".$part."\0users"} = 1; + } + } } - $aggregate{$symb.'_'.$_.'_attempts'} = 1; + $aggregate{$symb."\0".$part."\0attempts"} = 1; + } + if (keys (%aggregate) > 0) { + &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, + $cdomain,$cname); } - &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,$cdomain,$cname); } sub checkout_msg { @@ -501,6 +523,7 @@ sub start_problem { &Apache::lonxml::debug("Using default type, problem, :$uri:"); } } + $Apache::lonhomework::default_type = $Apache::lonhomework::type; #added vars to the scripting enviroment my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; @@ -543,11 +566,12 @@ sub start_problem { value="'.$env{'form.username'}.'" />'; if ($env{'user.adv'}) { $form_tag_start.= - ' '; } $form_tag_start.='
'; } @@ -621,6 +645,10 @@ sub start_problem { } my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; } + if (lc($env{'course.'.$env{'request.course.id'}. + '.disableexampointprint'}) eq 'yes') { + $allow_print_points=0; + } my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); $duedate = POSIX::strftime("%c",localtime($duedate)); my $temp_file; @@ -730,7 +758,8 @@ sub end_problem { } 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 + $result.=&Apache::lonxml::xmlend().''; + # normally we get it from above, but in CSTR # we always show answer mode too. } } elsif ($target eq 'meta') { @@ -1025,7 +1054,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; @@ -1049,17 +1080,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', @@ -1076,7 +1109,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)); @@ -1112,7 +1145,7 @@ sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; 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=(); @@ -1182,6 +1215,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.=''; @@ -1239,6 +1276,7 @@ sub end_part { } pop @Apache::inputtags::status; $Apache::inputtags::part=''; + $Apache::lonhomework::type = $Apache::lonhomework::default_type; return $result; } @@ -1246,7 +1284,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); @@ -1262,7 +1301,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') {