--- loncom/homework/structuretags.pm 2006/06/26 22:33:22 1.359 +++ loncom/homework/structuretags.pm 2006/11/20 11:52:10 1.369 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.359 2006/06/26 22:33:22 albertel Exp $ +# $Id: structuretags.pm,v 1.369 2006/11/20 11:52:10 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -134,7 +134,7 @@ sub page_start { $body_args{'force_register'} = 1; $body_args{'add_entries'} = \%add_entries; } - + $body_args{'no_auto_mt_title'} = 1; my $page_start = &Apache::loncommon::start_page($name,$extra_head, \%body_args); @@ -142,7 +142,7 @@ sub page_start { && $env{'request.state'} ne 'construct' && ($target eq 'web' || $target eq 'webgrade')) { - my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser(); + my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser(); if ($symb eq '' && !$publicuser) { my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); $help=&mt("Browsing resource, all submissions are temporary.")."
"; @@ -162,14 +162,14 @@ sub page_start { if ($target eq 'edit') { $form_tag_start.=&Apache::edit::form_change_detection(); } - $form_tag_start.='>'; + $form_tag_start.='>'."\n"; my $symb=&Apache::lonnet::symbread(); if ($symb =~ /\S/) { $symb= &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb)); $form_tag_start.= - ''; + "\t".''."\n"; } } return ($page_start,$form_tag_start); @@ -181,7 +181,7 @@ sub get_resource_name { if (defined($Apache::lonhomework::name)) { return $Apache::lonhomework::name; } - my ($symb)=&Apache::lonxml::whichuser(); + my ($symb)=&Apache::lonnet::whichuser(); my $name=&Apache::lonnet::gettitle($symb); if ($name eq '') { $name=&Apache::lonnet::EXT('resource.title'); @@ -198,7 +198,7 @@ sub get_resource_name { sub setup_rndseed { my ($safeeval)=@_; my $rndseed; - my ($symb)=&Apache::lonxml::whichuser(); + my ($symb)=&Apache::lonnet::whichuser(); if ($env{'request.state'} eq "construct" || $symb eq '' || $Apache::lonhomework::type eq 'practice' @@ -346,7 +346,7 @@ sub initialize_storage { undef(%Apache::lonhomework::results); undef(%Apache::lonhomework::history); my ($symb,$courseid,$domain,$name) = - &Apache::lonxml::whichuser($given_symb); + &Apache::lonnet::whichuser($given_symb); # anonymous users (CODEd exams) have no data if ($name eq 'anonymous' @@ -392,7 +392,7 @@ sub finalize_storage { my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results)); delete(@Apache::lonhomework::results{@remove}); my ($symb,$courseid,$domain,$name) = - &Apache::lonxml::whichuser($given_symb); + &Apache::lonnet::whichuser($given_symb); if ($env{'request.state'} eq 'construct' || $symb eq '' || $Apache::lonhomework::type eq 'practice') { @@ -528,7 +528,6 @@ sub init_problem_globals { undef($Apache::lonhomework::name); undef($Apache::lonhomework::default_type); undef($Apache::lonhomework::type); - undef($Apache::lonhomework::problemstatus); } sub reset_problem_globals { @@ -594,11 +593,7 @@ sub start_problem { $Apache::lonhomework::scantronmode=1; } - &initialize_storage(); if ($target ne 'analyze') { - 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'); if (($env{'request.state'} eq 'construct') && @@ -619,6 +614,12 @@ sub start_problem { } $Apache::lonhomework::default_type = $Apache::lonhomework::type; + &initialize_storage(); + if ($target eq 'web') { + &Apache::lonxml::debug(" grading history "); + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + #added vars to the scripting enviroment my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; $expression.='$external::type=\''.$Apache::lonhomework::type.'\';'; @@ -656,7 +657,7 @@ sub start_problem { } #handle rand seed in construction space my $rndseed=&setup_rndseed($safeeval); - my ($symb)=&Apache::lonxml::whichuser(); + my ($symb)=&Apache::lonnet::whichuser(); if ($env{'request.state'} ne "construct" && ($symb eq '' || $Apache::lonhomework::type eq 'practice')) { $form_tag_start.=''; # create a page header and exit if ($env{'request.state'} eq "construct") { @@ -1477,15 +1485,17 @@ sub end_preduedate { return ''; } +# In all the modes where text is +# displayable, all we do is eat up the text between the start/stop +# tags if the conditions are not right to display it. sub start_postanswerdate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' || + $target eq 'tex') { if ($Apache::lonhomework::scantronmode || $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); } - } elsif ($target eq 'tex') { - &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); } return ''; } @@ -1592,9 +1602,10 @@ sub end_startouttext { ." ". &Apache::edit::insertlist($target,$token). + '' . + &Apache::loncommon::helpLatexCheatsheet(). &Apache::edit::end_row(). - &Apache::edit::start_spanning_row()."\n" - . &Apache::loncommon::helpLatexCheatsheet () . + &Apache::edit::start_spanning_row()."\n". &Apache::edit::editfield($token->[1],$text,"",80,8,1); } if ($target eq 'modified') { @@ -1645,7 +1656,7 @@ sub start_simpleeditbutton { (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { my $url=$env{'request.noversionuri'}; $url=~s/\?.*$//; - my ($symb) = &Apache::lonxml::whichuser(); + my ($symb) = &Apache::lonnet::whichuser(); $result='
'. ''.&mt('Edit').' - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.'). &Apache::loncommon::help_open_topic('Caching').'

';