--- rat/lonpage.pm 2005/06/29 19:02:14 1.71 +++ rat/lonpage.pm 2010/07/13 00:16:23 1.94 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.71 2005/06/29 19:02:14 albertel Exp $ +# $Id: lonpage.pm,v 1.94 2010/07/13 00:16:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,9 @@ # ### + + + package Apache::lonpage; use strict; @@ -39,6 +42,9 @@ use Apache::lonmenu; use HTML::TokeParser; use GDBM_File; use Apache::lonsequence; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # -------------------------------------------------------------- Module Globals my %hash; @@ -75,7 +81,7 @@ sub tracetable { my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}}; $sofar= &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}}, - '&'.$frid.'&'); + '&'.$frid.$beenhere); $sofar++; if ($hash{'src_'.$frid}) { my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid}); @@ -152,6 +158,19 @@ sub handler { my $number_of_columns = 1; my $requrl=$r->uri; my $target = $env{'form.grade_target'}; + +# Short term solution: define target as 'tex_answer' when retrieving answers +# for resources in a .page when generating printouts. +# A better long-term fix would be to modify the way problem rendering, and +# answer rendering are retrieved for individual resources when printing a .page, +# so rendered problem and answer are sequential for individual resources in +# the .page +# + if ($target eq 'answer') { + if ($env{'form.answer_output_mode'} eq 'tex') { + $target = 'tex_answer'; + } + } # &Apache::lonnet::logthis("Got a target of $target"); if ($target eq 'meta') { &Apache::loncommon::content_type($r,'text/html'); @@ -180,8 +199,10 @@ sub handler { for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { my @colcont=split(/\&/,$rows[$i]); - foreach (@colcont) { - $symbhash{$hash{'src_'.$_}}=['page','notasymb']; + foreach my $rid (@colcont) { + my ($mapid,$resid)=split(/\./,$rid); + $symbhash{$hash{'src_'.$rid}}= + [$hash{'src_'.$rid},$resid]; } } } @@ -201,8 +222,6 @@ sub handler { my %ssivlink=(); my %ssialink=(); - my %metalink=(); - my %cellemb=(); my $allscript=''; @@ -225,7 +244,6 @@ sub handler { if ($hash{'encrypted_'.$_}) { $src=&Apache::lonenc::encrypted($src); } - $metalink{$_}=$src.'.meta'; $cellemb{$_}= &Apache::loncommon::fileembstyle($extension); if ($cellemb{$_} eq 'ssi') { @@ -237,29 +255,41 @@ sub handler { my %posthash=('request.prefix' => $prefix, 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); - if ($env{'form.grade_target'} eq 'tex') { + if (($env{'form.grade_target'} eq 'tex') || + ($env{'form.answer_output_mode'} eq 'tex')) { $posthash{'grade_target'}=$env{'form.grade_target'}; $posthash{'textwidth'}=$env{'form.textwidth'}; $posthash{'problem_split'}=$env{'form.problem_split'}; $posthash{'latex_type'}=$env{'form.latex_type'}; $posthash{'rndseed'}=$env{'form.rndseed'}; + $posthash{'answer_output_mode'} = $env{'form.answer_output_mode'}; } - if (($env{'form.'.$prefix.'submit'}) - || ($env{'form.all_submit'})) { - foreach (keys %env) { - if ($_=~/^form.$prefix/) { - my $name=$_; - $name=~s/^form.$prefix//; - $posthash{$name}=$env{$_}; - } - } + my $submitted=exists($env{'form.all_submit'}); + if (!$submitted) { + foreach my $key (keys(%env)) { + if ($key=~/^form.\Q$prefix\Esubmit_/) { + $submitted=1;last; + } + } + } + if ($submitted) { + foreach my $key (keys(%env)) { + if ($key=~/^form.\Q$prefix\E/) { + my $name=$key; + $name=~s/^form.\Q$prefix\E//; + $posthash{$name}=$env{$key}; + } + } + if (exists($env{'form.all_submit'})) { + $posthash{'all_submit'}='yes'; + } } my $output=Apache::lonnet::ssi($src,%posthash); - $output=~s|//(\s*)?\s||gs; - if ($target eq 'tex') { + $output=~s|//(\s*)?\s||gs; + if (($target eq 'tex') || ($target eq 'tex_answer')) { $output =~ s/^([^&]+)\\begin{document}//; $output =~ s/\\end{document}//; - $output = '\parbox{\minipagewidth}{ '.$output.' }'; +# $output = '\parbox{\minipagewidth}{ '.$output.' }'; #some additional cleanup necessary for LateX (due to limitations of table environment $output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; } @@ -323,11 +353,11 @@ sub handler { $output=~s/\]*\>//gsi; $output=~s/\<\/form[^\>]*\>//gsi; $output=~ - s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([\w\.\:]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; + s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; } $thisdir=~s/\/[^\/]*$//; foreach (@rlinks) { - unless (($_=~/^http:\/\//i) || + unless (($_=~/^https?\:\/\//i) || ($_=~/^\//) || ($_=~/^javascript:/i) || ($_=~/^mailto:/i) || @@ -348,131 +378,76 @@ sub handler { unless ($contents) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(''."\n". - ''."\n". - &Apache::lonmenu::registerurl(1,undef)."\n". - ''."\n". - ''. - &Apache::lonmenu::menubuttons(undef,$target,1) - ); + $r->print(&Apache::loncommon::start_page(undef,undef, + {'force_register' => 1,})); $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. '); - $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').'.'); + $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course'). + &Apache::loncommon::end_page()); } else { # ------------------------------------------------------------------ Build page # ---------------------------------------------------------------- Send headers - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { if ($isxml) { &Apache::loncommon::content_type($r,'text/xml'); - $r->send_http_header; - $r->print($xmlheader); } else { &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print(''); } + $r->send_http_header; # ------------------------------------------------------------------------ Head - $r->print("\n\n".$allmeta); if ($allscript) { - $r->print("\n\n"); + $allscript = + "\n".'\n"; } - $r->print(&Apache::lonmenu::registerurl(1,undef)); - $r->print("\n\n"); # ------------------------------------------------------------------ Start body - if ($isxml) { - $r->print($xmlbody); - } else { - $r->print( - ''. - &Apache::lonmenu::menubuttons(undef,$target,1) - ); - } + $r->print(&Apache::loncommon::start_page(undef,$allscript, + {'force_register' => 1, + 'bgcolor' => '#ffffff',})); # ------------------------------------------------------------------ Start form if ($nforms) { - $r->print('
'); } - } elsif ($target eq 'tex') { - $r->print('\documentclass{article} - \newcommand{\keephidden}[1]{} - \usepackage[dvips]{graphicx} - \usepackage{epsfig} - \usepackage{calc} - \usepackage{longtable} - \begin{document}'); + } elsif (($target eq 'tex') || ($target eq 'tex_answer')) { + # I think this is not needed as the header + # will be put in for each of the page parts + # by the londefdef.pm now that we are opening up + # the parts of a page. + #$r->print('\documentclass{article} + # \newcommand{\keephidden}[1]{} + # \usepackage[dvips]{graphicx} + # \usepackage{epsfig} + # \usepackage{calc} + # \usepackage{longtable} + # \begin{document}'); } # ----------------------------------------------------------------- Start table - if ($target eq 'tex') { - $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead '); + if (($target eq 'tex') || ($target eq 'tex_answer')) { +# # $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead '); if ($number_of_columns le $lcm) {$number_of_columns=$lcm;}; } else { $r->print(''); } +# generate rows for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print("\n"); } my @colcont=split(/\&/,$rows[$i]); my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { my $rid=$colcont[$j]; - my $metainfo = ''; - my $esrc=&Apache::lonnet::declutter($hash{'src_'.$rid}); - my ($mapid,$resid)=split(/\./,$rid); - my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); - if ($hash{'encrypted_'.$rid}) { - $symb=&Apache::lonenc::encrypted($symb); - $esrc=&Apache::lonenc::encrypted($esrc); - } - unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) { - $metainfo =''. - ''. - ''. - ''; - } - $metainfo .= ''. - ''. - ''; - if ( - ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && - (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && - ($hash{'src_'.$rid} !~ m-^/uploaded/-)) { - my ($mapid,$resid)=split(/\./,$rid); - my $symb= - &Apache::lonnet::declutter($hash{'map_id_'.$mapid}). - '___'.$resid.'___'. - &Apache::lonnet::declutter($hash{'src_'.$rid}); - $metainfo.= - ''. - '&command=submission">'. - ''. - ''. - ''. - '&command=gradingmenu">'. - ''. - ''. - ''. - '" >'. - ''. - ''; - } - $metainfo.='

'; - unless ($target eq 'tex') { + + my $metainfo =&get_buttons(\%hash,$rid).'
'; + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(''); } else { - for (my $incol=1;$incol<=$avespan;$incol++) { - $r->print(' & '); - } +# for (my $incol=1;$incol<=$avespan;$incol++) { +# $r->print(' & '); +# } } } - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(''); } else { - $r->print('REMOVETHEHEADOFLONGTABLE\\\\'); +# $r->print('REMOVETHEHEADOFLONGTABLE\\\\'); } } } - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print("\n
print(' bgcolor="'. $ssibgcolor{$rid}.'"'); @@ -494,21 +469,19 @@ sub handler { $r->print('>'); } $r->print($ssibody{$rid}); - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(''); } if ($env{'course.'. $env{'request.course.id'}. '.pageseparators'} eq 'yes') { - unless($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print('
'); - } else { - $r->print('\hline'); - } + } } } elsif ($cellemb{$rid} eq 'img') { $r->print('>'.$metainfo.''); + $hash{'src_'.$rid}.'" />'); } elsif ($cellemb{$rid} eq 'emb') { $r->print('>'.$metainfo.''); @@ -517,25 +490,25 @@ sub handler { &mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'

'. &Apache::londocs::entryline(0,&mt("Click to download or use your browser's Save Link function"),'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).'


'); } - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print('
"); } else { - $r->print('\end{longtable}\strut'); +# $r->print('\end{longtable}\strut'); } # ---------------------------------------------------------------- Submit, etc. if ($nforms) { @@ -543,8 +516,9 @@ sub handler { '
'); } - unless ($target eq 'tex') { - $r->print(''.&Apache::lonxml::xmlend()); + unless (($target eq 'tex') || ($target eq 'tex_answer')) { + $r->print(&Apache::loncommon::end_page({'discussion' + => 1,})); } else { $r->print('\end{document}'.$number_of_columns); } @@ -576,9 +550,65 @@ sub handler { return OK; } +sub get_buttons { + my ($hash,$rid) = @_; + + my $metainfo = ''; + my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); + my ($mapid,$resid)=split(/\./,$rid); + my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid}, + $resid, + $hash->{'src_'.$rid}); + if ($hash->{'encrypted_'.$rid}) { + $symb=&Apache::lonenc::encrypted($symb); + $esrc=&Apache::lonenc::encrypted($esrc); + } + if ($hash->{'src_'.$rid} !~ m-^/uploaded/- + && !$env{'request.enc'} + && ($env{'request.role.adv'} + || !$hash->{'encrypted_'.$rid})) { + $metainfo .=''. + ''. + ''. + ''; + } + $metainfo .= ''. + ''. + ''; + if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && + ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { + + if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { + $metainfo.= + ''. + '&command=submission">'. + ''. + ''. + ''. + '&command=gradingmenu">'. + ''. + ''; + } + if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { + $metainfo.= + ''. + '" >'. + ''. + ''; + } + } + return $metainfo; +} + 1; __END__ + =head1 NAME Apache::lonpage - Page Handler @@ -680,5 +710,3 @@ tracetable() : Build page table. =cut - -