--- loncom/homework/structuretags.pm 2005/04/18 22:33:38 1.286 +++ loncom/homework/structuretags.pm 2005/04/25 21:40:33 1.290 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.286 2005/04/18 22:33:38 albertel Exp $ +# $Id: structuretags.pm,v 1.290 2005/04/25 21:40:33 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"; + } + return $body_tag_start; +} sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my %found; @@ -93,34 +121,11 @@ sub page_start { $body_tag_start=&Apache::loncommon::bodytag(); $body_tag_start.=&Apache::lonxml::message_location(); } elsif (!defined($found{'body'})) { - $body_tag_start=''."\n"; - } + my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, + $safeeval); + $body_tag_start=&body_tag_start($background,$bgcolor); if ($target eq 'web' && $env{'request.state'} ne 'construct') { my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser(); @@ -321,8 +326,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 +344,7 @@ sub finalize_storage { } return $result; } +use Data::Dumper; # -------------------------------------------------------------store_aggregates # Sends hash of values to be incremented in nohist_resourcetracker.db @@ -349,9 +354,10 @@ sub store_aggregates { my ($symb,$courseid) = @_; my %aggregate; my @parts; - my ($cdomain,$cname) = split(/_/,$courseid); + 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\.(\d+)\.tries/) { + if ($key =~ /resource\.([^\.]+)\.tries/) { push(@parts, $1); } } @@ -360,15 +366,18 @@ sub store_aggregates { eq 'APPROX_ANS' || $Apache::lonhomework::results{'resource.'.$part.'.award'} eq 'EXACT_ANS') { - $aggregate{$symb.'_'.$part.'_correct'} = 1; + $aggregate{$symb."\0".$part."\0correct"} = 1; } if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) { - $aggregate{$symb.'_'.$part.'_users'} = 1; + $aggregate{$symb."\0".$part."\0users"} = 1; } - $aggregate{$symb.'_'.$part.'_attempts'} = 1; + $aggregate{$symb."\0".$part."\0attempts"} = 1; + } + if (%aggregate) { + &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, + $cdomain,$cname); + } - &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate, - $cdomain,$cname); } sub checkout_msg {