--- rat/lonpage.pm 2008/11/20 13:11:43 1.88 +++ rat/lonpage.pm 2012/11/30 20:48:20 1.99 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.88 2008/11/20 13:11:43 jms Exp $ +# $Id: lonpage.pm,v 1.99 2012/11/30 20:48:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,105 +27,7 @@ # ### -=head1 NAME - -Apache::lonpage - Page Handler - -=head1 SYNOPSIS - -Invoked by /etc/httpd/conf/srm.conf: - - - SetHandler perl-script - PerlHandler Apache::lonpage - - -=head1 INTRODUCTION - -This module renders a .page resource. - -This is part of the LearningOnline Network with CAPA project -described at http://www.lon-capa.org. - -=head1 HANDLER SUBROUTINE - -This routine is called by Apache and mod_perl. - -=over 4 - -=item * - -set document type for header only - -=item * - -tie db file - -=item * - -render page - -=item * - -add to symb list - -=item * - -page parms - -=item * - -Get SSI output, post parameters - -=item * - -SSI cell rendering -=item * - -Deal with Applet codebases - -=item * - -Build page - -=item * - -send headers - -=item * - -start body - -=item * - -start form - -=item * - -start table - -=item * - -submit element, etc, render page, untie hash - -=back - -=head1 OTHER SUBROUTINES - -=over 4 - -=item * - -euclid() : Euclid's method for determining the greatest common denominator. - -=item * - -tracetable() : Build page table. - -=back - -=cut package Apache::lonpage; @@ -256,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'); @@ -299,6 +214,10 @@ sub handler { my $lcm=1; my $contents=0; my $nforms=0; + my $nuploads=0; + my %turninpaths; + my %multiresps; + my $turninparent; my %ssibody=(); my %ssibgcolor=(); @@ -308,6 +227,7 @@ sub handler { my %ssialink=(); my %cellemb=(); + my %cellexternal=(); my $allscript=''; my $allmeta=''; @@ -325,13 +245,20 @@ sub handler { $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1)); foreach (@colcont) { my $src=$hash{'src_'.$_}; - my ($extension)=($src=~/\.(\w+)$/); + my ($extension)=($src=~/\.(\w+)$/); + $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:'); if ($hash{'encrypted_'.$_}) { $src=&Apache::lonenc::encrypted($src); } $cellemb{$_}= &Apache::loncommon::fileembstyle($extension); - if ($cellemb{$_} eq 'ssi') { + if ($cellexternal{$_}) { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { + $ssibody{$_} = <No iframe support! +ENDEXT + } + } elsif ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell my ($mapid,$resid)=split(/\./,$_); my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); @@ -340,12 +267,14 @@ 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'}; } my $submitted=exists($env{'form.all_submit'}); if (!$submitted) { @@ -369,10 +298,10 @@ sub handler { } my $output=Apache::lonnet::ssi($src,%posthash); $output=~s|//(\s*)?\s||gs; - if ($target eq 'tex') { + 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; } @@ -435,12 +364,27 @@ sub handler { $nforms++; $output=~s/\]*\>//gsi; $output=~s/\<\/form[^\>]*\>//gsi; + if ($output=~/\]+name\s*=\s*[\'\"]*HWFILE/) { + $nuploads++; + } $output=~ s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; + if ($nuploads) { + $output=~ + s/\<(input[^\>]+name=\"\Q$prefix\EHWFILE[^\>]+)\s*id\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\)]*)\>/\<$1 id="$prefix$2" $3\>/gsi; + ($turninpaths{$prefix},$multiresps{$prefix}) = + &Apache::loncommon::get_turnedin_filepath($symb,$env{'user.name'},$env{'user.domain'}); + if ($turninparent eq '') { + $turninparent = $turninpaths{$prefix}; + $turninparent =~ s{(/[^/]+)$}{}; + } + } + $output=~ + s/\<((?:input|select)[^\>]+\Qjavascript:setSubmittedPart\E)\(\s*[\'\"]([^\'\"]+)[\'\"]*\s*\)/\<$1('$2','$prefix')/gsi; } $thisdir=~s/\/[^\/]*$//; foreach (@rlinks) { - unless (($_=~/^http:\/\//i) || + unless (($_=~/^https?\:\/\//i) || ($_=~/^\//) || ($_=~/^javascript:/i) || ($_=~/^mailto:/i) || @@ -470,7 +414,7 @@ sub handler { # ------------------------------------------------------------------ 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'); } else { @@ -484,28 +428,44 @@ sub handler { $allscript. "\n\n"; } + if (($nforms) && ($nuploads)) { + $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps); + } # ------------------------------------------------------------------ Start body $r->print(&Apache::loncommon::start_page(undef,$allscript, {'force_register' => 1, 'bgcolor' => '#ffffff',})); # ------------------------------------------------------------------ Start form if ($nforms) { - $r->print('
1) { + $multi = 1; + } + $fmtag .= 'onsubmit="return file_submission_check(this,'."'$turninparent','$multi'".');"'; + } + $fmtag .= ' action="'. &Apache::lonenc::check_encrypt($requrl) - .'">'); + .'">'; + $r->print($fmtag); } - } 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(''); @@ -513,7 +473,7 @@ sub handler { # 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]); @@ -522,11 +482,11 @@ sub handler { my $rid=$colcont[$j]; my $metainfo =&get_buttons(\%hash,$rid).'
'; - unless ($target eq 'tex') { + 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}.'"'); @@ -547,14 +507,17 @@ sub handler { } $r->print('>'); } - $r->print($ssibody{$rid}); - unless ($target eq 'tex') { + unless (($cellexternal{$rid}) && + ($target eq 'tex') && ($target eq 'tex_answer')) { + $r->print($ssibody{$rid}); + } + 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('
'); } } @@ -569,25 +532,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) { @@ -595,7 +558,7 @@ sub handler { '
'); } - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { $r->print(&Apache::loncommon::end_page({'discussion' => 1,})); } else { @@ -632,10 +595,6 @@ sub handler { sub get_buttons { my ($hash,$rid) = @_; - # which icons do we use? - my $extension='png'; - if ($env{'environment.icons'} eq 'classic') { $extension='gif'; } - my $metainfo = ''; my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); my ($mapid,$resid)=split(/\./,$rid); @@ -647,20 +606,24 @@ sub get_buttons { $esrc=&Apache::lonenc::encrypted($esrc); } if ($hash->{'src_'.$rid} !~ m-^/uploaded/- + && $hash->{'src_'.$rid} !~ m{^https?://} && !$env{'request.enc'} && ($env{'request.role.adv'} || !$hash->{'encrypted_'.$rid})) { $metainfo .=''. ''. - ''. + ''. + ''; + } + if (($hash->{'src_'.$rid} !~ m{^/uploaded/}) && + ($hash->{'src_'.$rid} !~ m{^https?://})) { + $metainfo .= ''. + ''. ''; } - $metainfo .= ''. - ''. - ''; - if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && + if (($hash->{'src_'.$rid}=~/$LONCAPA::assess_re/) && ($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) { @@ -668,12 +631,12 @@ sub get_buttons { ''. '&command=submission">'. - ''. + ''. ''. ''. '&command=gradingmenu">'. - ''. + ''. ''; } if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { @@ -681,7 +644,7 @@ sub get_buttons { ''. '" >'. - ''. + ''. ''; } } @@ -692,6 +655,104 @@ sub get_buttons { __END__ +=head1 NAME + +Apache::lonpage - Page Handler + +=head1 SYNOPSIS + +Invoked by /etc/httpd/conf/srm.conf: + + SetHandler perl-script + PerlHandler Apache::lonpage + + +=head1 INTRODUCTION + +This module renders a .page resource. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 HANDLER SUBROUTINE + +This routine is called by Apache and mod_perl. + +=over 4 + +=item * + +set document type for header only + +=item * + +tie db file + +=item * + +render page + +=item * + +add to symb list + +=item * + +page parms + +=item * + +Get SSI output, post parameters + +=item * + +SSI cell rendering + +=item * + +Deal with Applet codebases + +=item * + +Build page + +=item * + +send headers + +=item * + +start body + +=item * + +start form + +=item * + +start table + +=item * + +submit element, etc, render page, untie hash + +=back + +=head1 OTHER SUBROUTINES + +=over 4 + +=item * + +euclid() : Euclid's method for determining the greatest common denominator. + +=item * + +tracetable() : Build page table. + +=back + +=cut