--- loncom/homework/structuretags.pm 2006/04/14 20:16:23 1.343 +++ loncom/homework/structuretags.pm 2006/06/26 22:33:22 1.359 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.343 2006/04/14 20:16:23 albertel Exp $ +# $Id: structuretags.pm,v 1.359 2006/06/26 22:33:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,9 @@ 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')); } @@ -70,7 +73,8 @@ sub end_tex { } sub page_start { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name, + $extra_head)=@_; my %found; foreach my $taginside (@$tagstack) { foreach my $taglookedfor ('html','body','form') { @@ -78,17 +82,18 @@ sub page_start { } } - if ($target eq 'tex') { return &Apache::londefdef::start_html($target,$token,$tagstack, $parstack,$parser,$safeeval); } - my $page_start; - if (!defined($found{'html'})) { + my %body_args; + if (defined($found{'html'})) { + $body_args{'skip_phases'}{'head'}=1; + } else { - my $extra_head = &Apache::lonhtmlcommon::spellheader(); + $extra_head .= &Apache::lonhtmlcommon::spellheader(); my $css_href = &Apache::lonnet::EXT('resource.0.cssfile'); if ($css_href =~ /\S/) { @@ -102,18 +107,15 @@ sub page_start { "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n". &Apache::loncommon::browser_and_searcher_javascript(). "\n\n"; - } - $page_start .= - &Apache::loncommon::head($name,$extra_head, - {'force_register' => - ($target ne 'edit') }); } - if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { + 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') { - $page_start.=&Apache::loncommon::bodytag(); - $page_start.=&Apache::lonxml::message_location(); + # no extra args to bodytag } } elsif (!defined($found{'body'})) { my %add_entries; @@ -122,27 +124,36 @@ sub page_start { if ($background ne '' ) { $add_entries{'background'} = $background; } + my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, $safeeval); - - if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; } - $page_start .= - &Apache::loncommon::bodytag(undef,undef,\%add_entries,undef,undef, - 1,undef,undef,$bgcolor,$target,1); - - 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.")."
"; - $page_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; + } + + 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::lonxml::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; } - $page_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='
'; + } } return ($page_start,$form_tag_start); } @@ -232,7 +251,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') .'
'. '
'; } @@ -240,7 +259,7 @@ sub problem_edit_header { sub problem_edit_footer { return '

'. - &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields). + &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()). "\n
\n".&Apache::loncommon::end_page(); } @@ -323,9 +342,18 @@ Feedback Mode: } 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::lonxml::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') { @@ -345,6 +373,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=(); } @@ -357,11 +386,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::lonxml::whichuser($given_symb); if ($env{'request.state'} eq 'construct' || $symb eq '' || $Apache::lonhomework::type eq 'practice') { @@ -432,13 +463,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'}

 -
+
@@ -450,9 +482,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". -
+
@@ -493,7 +526,9 @@ sub init_problem_globals { @Apache::structuretags::whileline=(); $Apache::lonhomework::scantronmode=0; undef($Apache::lonhomework::name); - + undef($Apache::lonhomework::default_type); + undef($Apache::lonhomework::type); + undef($Apache::lonhomework::problemstatus); } sub reset_problem_globals { @@ -505,6 +540,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 { @@ -586,11 +626,15 @@ sub start_problem { my $status; my $accessmsg; - #should get back a or the neccesary stuff to start XML/MathML my $name= &get_resource_name($parstack,$safeeval); - my ($result,$form_tag_start)= - &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval, - $name); + 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); } @@ -852,10 +896,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/) { @@ -863,7 +907,6 @@ 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_/) { @@ -880,7 +923,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. } @@ -948,7 +991,7 @@ sub end_library { $result=&problem_edit_footer(); } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && $env{'request.state'} eq "construct") { - $result.=''.&Apache::lonxml::xmlend(); + $result.=''.&Apache::loncommon::end_page({'discussion' => 1}); } if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') }; return $result; @@ -1351,7 +1394,7 @@ sub start_part { } if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } elsif ($target eq 'web') { - $result.=''; + $result.=''; } } } @@ -1604,7 +1647,7 @@ sub start_simpleeditbutton { $url=~s/\?.*$//; my ($symb) = &Apache::lonxml::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;