--- loncom/homework/structuretags.pm 2006/03/29 22:41:32 1.339 +++ loncom/homework/structuretags.pm 2007/07/17 18:18:54 1.383 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.339 2006/03/29 22:41:32 albertel Exp $ +# $Id: structuretags.pm,v 1.383 2007/07/17 18:18:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,15 +38,28 @@ use Apache::lonlocal; use Apache::lonxml; use Apache::lonenc(); use Time::HiRes qw( gettimeofday tv_interval ); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + BEGIN { &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,$style)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); - if ($target eq 'web' || $target eq 'webgrade') { - return $bodytext; + if ($target ne 'edit' && $target ne 'modified') { + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); + if ($target eq 'web' || $target eq 'webgrade') { + return $bodytext; + } + } elsif ($target eq "edit" ) { + my $bodytext = + &Apache::lonxml::get_all_text_unbalanced("/web",$parser); + my $result = &Apache::edit::tag_start($target,$token); + $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1); + return $result; + } elsif ( $target eq "modified" ) { + return $token->[4].&Apache::edit::modifiedfield("/web",$parser); } return ''; } @@ -58,9 +71,19 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); - if ($target eq 'tex') { - return $bodytext.' '; + if ($target ne 'edit' && $target ne 'modified') { + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); + if ($target eq 'tex') { + return $bodytext.' '; + } + } elsif ($target eq "edit" ) { + my $bodytext = + &Apache::lonxml::get_all_text_unbalanced("/tex",$parser); + my $result = &Apache::edit::tag_start($target,$token); + $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1); + return $result; + } elsif ( $target eq "modified" ) { + return $token->[4].&Apache::edit::modifiedfield("/tex",$parser); } return $result;; } @@ -69,35 +92,9 @@ sub end_tex { return ''; } -sub body_tag_start { - my ($target,$background,$bgcolor)=@_; - my $body_tag_start=''; - } + if ($target eq 'tex') { + return + &Apache::londefdef::start_html($target,$token,$tagstack, + $parstack,$parser,$safeeval); + } + + $extra_head.= ' + +'; + + my %body_args; + if (defined($found{'html'})) { + $body_args{'skip_phases'}{'head'}=1; + } else { + + $extra_head .= &Apache::lonhtmlcommon::spellheader(); + + $extra_head .= &Apache::londefdef::generate_css_links(); + if ($target eq 'edit') { - $head_tag_start.=&Apache::edit::js_change_detection(); + $extra_head.=&Apache::edit::js_change_detection(). + "\n"; } } - my $body_tag_start; - if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { - if ($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(); - } - } else { - if ($target eq 'web' || $target eq 'edit') { - $body_tag_start=&Apache::loncommon::bodytag(undef,undef,undef,1); - $body_tag_start.=&Apache::lonxml::message_location(); - } + + if (defined($found{'body'})) { + $body_args{'skip_phases'}{'body'}=1; + } elsif (!defined($found{'body'}) + && $env{'request.state'} eq 'construct') { + if ($target eq 'web' || $target eq 'edit') { + # no extra args to bodytag } } elsif (!defined($found{'body'})) { + my %add_entries; my $background=&Apache::lonxml::get_param('background',$parstack, $safeeval); + if ($background ne '' ) { + $add_entries{'background'} = $background; + } + 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) { - my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); - $help=&mt("Browsing resource, all submissions are temporary.")."
"; - $body_tag_start.=$help; - } + if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; } + + $body_args{'bgcolor'} = $bgcolor; + $body_args{'no_title'} = 1; + $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); + + if (!defined($found{'body'}) + && $env{'request.state'} ne 'construct' + && ($target eq 'web' || $target eq 'webgrade')) { + + 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.")."
"; + $page_start .= $help; } - $body_tag_start.=&Apache::lonxml::message_location(); } + + if (!defined($found{'body'})) { + $page_start .= &Apache::lonxml::message_location(); + } + my $form_tag_start; if (!defined($found{'form'})) { $form_tag_start='
'."\n"; + } } - return ($result,$head_tag_start,$body_tag_start,$form_tag_start); + return ($page_start,$form_tag_start); } #use Time::HiRes(); @@ -174,7 +205,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'); @@ -191,7 +222,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' @@ -206,7 +237,8 @@ sub setup_rndseed { } $env{'form.rndseed'}=$rndseed; } - if ($env{'form.resetdata'} eq &mt('New Problem Variation') || + if ( ($env{'form.resetdata'} eq &mt('New Problem Variation') + && $env{'form.submitted'} eq 'yes') || $env{'form.newrandomization'} eq &mt('New Randomization')) { srand(time); $rndseed=int(rand(2100000000)); @@ -244,7 +276,7 @@ sub problem_edit_header {
'. - &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help') + &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help') .'
'. '
'; } @@ -252,8 +284,8 @@ sub problem_edit_header { sub problem_edit_footer { return '

'. - &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields). - "\n
\n".&Apache::loncommon::endbodytag()."\n"; + &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()). + "\n\n".&Apache::loncommon::end_page(); } sub option { @@ -269,9 +301,7 @@ sub option { sub problem_web_to_edit_header { my ($rndseed)=@_; my $result.=''; - if (!$Apache::lonhomework::parsing_a_task) { - $result .= ''; - } + $result .= ''; $result .= ' @@ -286,9 +316,9 @@ sub problem_web_to_edit_header { : &mt(' Show All Foils'); if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; } - $result.= ' />'.$show_all_foils_text. + $result.= ' />'.$show_all_foils_text.''. &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems'). - '
'; + '
'; if (!$Apache::lonhomework::parsing_a_task) { $result.=" @@ -330,21 +360,45 @@ Feedback Mode: '.'.&Apache::loncommon::help_open_topic("Analyze_Problem", '',undef,undef,300). '
'; + } elsif ($Apache::lonhomework::parsing_a_task) { + $result.=" + +Problem Status: + + + +
"; } return $result; } sub initialize_storage { - %Apache::lonhomework::results=(); - %Apache::lonhomework::history=(); - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + my ($given_symb) = @_; + undef(%Apache::lonhomework::results); + undef(%Apache::lonhomework::history); + my ($symb,$courseid,$domain,$name) = + &Apache::lonnet::whichuser($given_symb); + + # anonymous users (CODEd exams) have no data + if ($name eq 'anonymous' + && !defined($domain)) { + return; + } + if ($env{'request.state'} eq 'construct' || $symb eq '' || $Apache::lonhomework::type eq 'practice') { my $namespace = $symb || $env{'request.uri'}; if ($env{'form.resetdata'} eq &mt('Reset Submissions') || - $env{'form.resetdata'} eq &mt('New Problem Variation') || + ($env{'form.resetdata'} eq &mt('New Problem Variation') + && $env{'form.submitted'} eq 'yes') || $env{'form.newrandomization'} eq &mt('New Randomization')) { &Apache::lonnet::tmpreset($namespace,'',$domain,$name); &Apache::lonxml::debug("Attempt reset"); @@ -357,6 +411,7 @@ sub initialize_storage { %Apache::lonhomework::history= &Apache::lonnet::restore($symb,$courseid,$domain,$name); } + #ignore error conditions my ($temp)=keys %Apache::lonhomework::history ; if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } @@ -369,11 +424,13 @@ sub initialize_storage { # Will increment totals for attempts, students, and corrects # if running user has student role. sub finalize_storage { + my ($given_symb) = @_; my $result; if (%Apache::lonhomework::results) { my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results)); delete(@Apache::lonhomework::results{@remove}); - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); + my ($symb,$courseid,$domain,$name) = + &Apache::lonnet::whichuser($given_symb); if ($env{'request.state'} eq 'construct' || $symb eq '' || $Apache::lonhomework::type eq 'practice') { @@ -444,13 +501,14 @@ sub checkout_msg { 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.', 'checkout'=>'Check out Exam for Viewing', 'checkout?'=>'Check out Exam?'); + my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); return (<$lt{'resource'}

$lt{'id_expln'}

$lt{'warning'}

 -
+
@@ -462,9 +520,10 @@ sub firstaccess_msg { my ($map)=&Apache::lonnet::decode_symb($symb); my $foldertitle=&Apache::lonnet::gettitle($map); &Apache::lonxml::debug("map is $map title is $foldertitle"); + my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); return (<The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle". -
+
@@ -505,7 +564,8 @@ sub init_problem_globals { @Apache::structuretags::whileline=(); $Apache::lonhomework::scantronmode=0; undef($Apache::lonhomework::name); - + undef($Apache::lonhomework::default_type); + undef($Apache::lonhomework::type); } sub reset_problem_globals { @@ -517,6 +577,11 @@ sub reset_problem_globals { #detect if we try to do 2 problems in one file # undef($Apache::lonhomework::parsing_a_problem); undef($Apache::lonhomework::name); + undef($Apache::lonhomework::default_type); + undef($Apache::lonhomework::type); + undef($Apache::lonhomework::scantronmode); + undef($Apache::lonhomework::problemstatus); + undef($Apache::lonhomework::ignore_response_errors); } sub set_problem_state { @@ -566,11 +631,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') && @@ -591,6 +652,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.'\';'; @@ -598,9 +665,15 @@ sub start_problem { my $status; my $accessmsg; - #should get back a or the neccesary stuff to start XML/MathML - my ($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); + my ($result,$form_tag_start); + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex' + || $target eq 'edit') { + ($result,$form_tag_start) = + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, + $name); + } + if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';} if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); } @@ -615,14 +688,14 @@ sub start_problem { $Apache::lonhomework::history{"resource.0.outtoken"}= $token; } - $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + $result.=&Apache::lonxml::printtokenheader($target,$token); } if ($env{'form.markaccess'}) { &Apache::lonnet::set_first_access('map'); } #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.=''; - my $msg=$body_tag_start; + my $msg; if ($status eq 'UNAVAILABLE') { $msg.='

'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'

'; } elsif ($status ne 'NOT_YET_VIEWED') { @@ -675,7 +747,7 @@ sub start_problem { if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') { $msg.='The problem '.$accessmsg; } elsif ($status eq 'UNCHECKEDOUT') { - $msg.=&checkout_msg; + $msg.=&checkout_msg(); } elsif ($status eq 'NOT_YET_VIEWED') { $msg.=&firstaccess_msg($accessmsg,$symb); } elsif ($status eq 'NOT_IN_A_SLOT') { @@ -697,17 +769,21 @@ sub start_problem { my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, $style); if ($target eq 'web') { - $result .= $head_tag_start.''; - $result .= $body_tag_start; - $result .= &Apache::bridgetask::proctor_validation_screen(); + $result .= + &Apache::bridgetask::proctor_validation_screen($slot); } elsif ($target eq 'grade') { &Apache::bridgetask::proctor_check_auth($slot_name,$slot, 'problem'); } } elsif ($target eq 'web') { - my $name= &get_resource_name($parstack,$safeeval); - $result.="$head_tag_start$name - $body_tag_start \n $form_tag_start". + if ($status eq 'CAN_ANSWER' + && $slot_name ne '' + && $Apache::lonhomework::history{'resource.0.checkedin'} eq '') { + # unproctored slot access, self checkin + &Apache::bridgetask::check_in('problem',undef,undef, + $slot_name); + } + $result.="\n $form_tag_start \t". ''; # create a page header and exit if ($env{'request.state'} eq "construct") { @@ -725,15 +801,13 @@ sub start_problem { } } elsif ($target eq 'edit') { - $result.=$head_tag_start."".$body_tag_start.$form_tag_start. - &problem_edit_header(); + $result .= $form_tag_start.&problem_edit_header(); $Apache::lonxml::warnings_error_header= &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."
"; my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; } elsif ($target eq 'modified') { $result=$token->[4]; - $result.=&Apache::edit::handle_insert(); } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -751,7 +825,6 @@ sub end_problem { } if ($target eq 'tex') { - # Figure out the front matter and replace the # INSERTTEXFRONTMATTERHERE in result with it. note that we do # this in end_problem because whether or not we display due @@ -827,14 +900,14 @@ sub end_problem { if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} } } else { - $frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; + $frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage; } } else { if (not $env{'request.symb'} =~ m/\.page_/) { $frontmatter .= $begin_doc.$toc_line; if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';} } else { - $frontmatter .= '\vskip 1mm \\\\\\\\'; + $frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage; } } $result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/; @@ -868,10 +941,10 @@ sub end_problem { if ($target ne 'tex' && $env{'form.answer_output_mode'} ne 'tex') { $result.=""; - $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields); + $result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()); } if ($target eq 'web') { - $result.=&Apache::lonxml::xmlend().''; + $result.= &Apache::loncommon::end_page({'discussion' => 1}); } elsif ($target eq 'tex') { my $endminipage = ''; if (not $env{'form.problem_split'}=~/yes/) { @@ -879,13 +952,12 @@ sub end_problem { } 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_/) { $result .= $endminipage.'\end{document} '; } else { - $result .= ''; + $result .= $endminipage; } } } @@ -896,7 +968,7 @@ sub end_problem { } if ($target eq 'answer' && ($env{'request.state'} eq 'construct') && $env{'form.answer_output_mode'} ne 'tex') { - $result.=&Apache::lonxml::xmlend().''; + $result.=&Apache::loncommon::end_page({'discussion' => 1}); # normally we get it from above, but in CSTR # we always show answer mode too. } @@ -912,7 +984,6 @@ sub end_problem { $result .= &problem_edit_footer(); } elsif ($target eq 'modified') { $result .= $token->[2]; - $result.=&Apache::edit::handle_insertafter($token->[1]); } if ($env{'request.state'} eq 'construct' && $target eq 'web') { @@ -927,29 +998,29 @@ sub end_problem { sub start_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my ($result,$head_tag_start,$body_tag_start,$form_tag_start); - if ($$tagstack[0] eq 'library') { + my ($result,$form_tag_start); + if ($#$tagstack eq 0 && $$tagstack[0] eq 'library') { &init_problem_globals('library'); $Apache::lonhomework::type='problem'; } if ($target eq 'edit') { - ($result,$head_tag_start,$body_tag_start,$form_tag_start)= - &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - $result.=$head_tag_start."".$body_tag_start.$form_tag_start. - &problem_edit_header(); + ($result,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, + 'Edit'); + $result.=$form_tag_start.&problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; } elsif ($target eq 'modified') { $result=$token->[4]; - $result.=&Apache::edit::handle_insert(); - } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && - $env{'request.state'} eq "construct" ) { - ($result,$head_tag_start,$body_tag_start,$form_tag_start)= - &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + } elsif (($target eq 'web' || $target eq 'webgrade') + && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') + && $env{'request.state'} eq "construct" ) { my $name=&get_resource_name($parstack,$safeeval); + ($result,$form_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, + $name); my $rndseed=&setup_rndseed($safeeval); - $result.="$head_tag_start$name - $body_tag_start \n $form_tag_start". + $result.=" \n $form_tag_start". ''; $result.=&problem_web_to_edit_header($rndseed); } @@ -961,12 +1032,14 @@ sub end_library { my $result=''; if ($target eq 'edit') { $result=&problem_edit_footer(); - } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && - $env{'request.state'} eq "construct") { - $result.=''.&Apache::loncommon::endbodytag(). - &Apache::lonxml::xmlend(); + } elsif ($target eq 'web' + && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') + && $env{'request.state'} eq "construct") { + $result.=''.&Apache::loncommon::end_page({'discussion' => 1}); + } + if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') { + &reset_problem_globals('library'); } - if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') }; return $result; } @@ -1169,9 +1242,16 @@ sub end_while { while ($return) { if (time-$starttime > $Apache::lonnet::perlvar{'lonScriptTimeout'}) { - #$return = 0; $error=1; next; + $return = 0; $error=1; next; } $result.=&Apache::scripttag::xmlparse($bodytext); + if ($target eq 'grade' || $target eq 'answer' || + $target eq 'analyze') { + # grade/answer/analyze should produce no output but if we + # are redirecting, the redirecter should know what to do + # with the output + if (!$Apache::lonxml::redirection) { undef($result); } + } $return = &Apache::run::run($code,$safeeval); } if ($error) { @@ -1367,7 +1447,7 @@ sub start_part { } if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } elsif ($target eq 'web') { - $result.=''; + $result.=''; } } } @@ -1385,7 +1465,6 @@ sub start_part { #limiting ids to only letters numbers, and space $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs; $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); } } return $result; @@ -1423,7 +1502,6 @@ sub end_part { $result.=&Apache::edit::end_table(); } elsif ($target eq 'modified') { $result .= $token->[2]; - $result.=&Apache::edit::handle_insertafter($token->[1]); } pop @Apache::inputtags::status; $Apache::inputtags::part=''; @@ -1450,15 +1528,21 @@ 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') { + my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) || + &Apache::lonnet::allowed('pav', + $env{'request.course.id'}.'/'.$env{'request.course.sec'}); + 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::inputtags::status['-1'] ne 'SHOW_ANSWER' || + (($target eq 'tex') && !$pav)) { &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); } - } elsif ($target eq 'tex') { - &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); } return ''; } @@ -1565,9 +1649,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') { @@ -1585,7 +1670,8 @@ sub start_endouttext { if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; } if ($target eq "modified") { $result=''. - &Apache::edit::handle_insertafter('startouttext'); } + &Apache::edit::handle_insertafter('startouttext'); + } return $result; } @@ -1618,9 +1704,9 @@ 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.'). + ''.&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').'

'; } return $result;