--- rat/lonpage.pm 2002/09/01 19:29:01 1.45 +++ rat/lonpage.pm 2011/11/07 20:06:29 1.97 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.45 2002/09/01 19:29:01 www Exp $ +# $Id: lonpage.pm,v 1.97 2011/11/07 20:06:29 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,30 +25,26 @@ # # http://www.lon-capa.org/ # -# (TeX Content Handler -# -# YEAR=2000 -# 05/29/00,05/30 Gerd Kortemeyer) -# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23, -# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16, -# YEAR=2001 -# 08/13/01,08/30,10/1 Gerd Kortemeyer -# 12/16 Scott Harrison -# YEAR=2002 -# 03/19 Gerd Kortemeyer -# ### + + + package Apache::lonpage; use strict; use Apache::Constants qw(:common :http); -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonxml(); +use Apache::lonlocal; +use Apache::lonmenu; use HTML::TokeParser; use GDBM_File; use Apache::lonsequence; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # -------------------------------------------------------------- Module Globals my %hash; @@ -72,66 +68,70 @@ sub euclid { sub tracetable { my ($sofar,$rid,$beenhere)=@_; my $further=$sofar; + my $randomout=0; + unless ($env{'request.role.adv'}) { + $randomout = $hash{'randomout_'.$rid}; + } unless ($beenhere=~/\&$rid\&/) { - $beenhere.=$rid.'&'; - - if (defined($hash{'is_map_'.$rid})) { - if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) && - (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) { - my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}}; - $sofar= - &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}}, - '&'.$frid.'&'); - $sofar++; - if ($hash{'src_'.$frid}) { - my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid}); - if (($brepriv eq '2') || ($brepriv eq 'F')) { - if (defined($rows[$sofar])) { - $rows[$sofar].='&'.$frid; - } else { - $rows[$sofar]=$frid; - } - } - } - } - } else { - $sofar++; - if ($hash{'src_'.$rid}) { - my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid}); - if (($brepriv eq '2') || ($brepriv eq 'F')) { - if (defined($rows[$sofar])) { - $rows[$sofar].='&'.$rid; - } else { - $rows[$sofar]=$rid; - } - } - } - } - - if (defined($hash{'to_'.$rid})) { - my $mincond=1; - my $next=''; - foreach (split(/\,/,$hash{'to_'.$rid})) { - my $thiscond= + $beenhere.=$rid.'&'; + unless ($randomout) { + if (defined($hash{'is_map_'.$rid})) { + if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) && + (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) { + my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}}; + $sofar= + &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}}, + '&'.$frid.$beenhere); + $sofar++; + if ($hash{'src_'.$frid}) { + my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid}); + if (($brepriv eq '2') || ($brepriv eq 'F')) { + if (defined($rows[$sofar])) { + $rows[$sofar].='&'.$frid; + } else { + $rows[$sofar]=$frid; + } + } + } + } + } else { + $sofar++; + if ($hash{'src_'.$rid}) { + my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid}); + if (($brepriv eq '2') || ($brepriv eq 'F')) { + if (defined($rows[$sofar])) { + $rows[$sofar].='&'.$rid; + } else { + $rows[$sofar]=$rid; + } + } + } + } + } + + if (defined($hash{'to_'.$rid})) { + my $mincond=1; + my $next=''; + foreach (split(/\,/,$hash{'to_'.$rid})) { + my $thiscond= &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}}); - if ($thiscond>=$mincond) { - if ($next) { - $next.=','.$_.':'.$thiscond; - } else { - $next=$_.':'.$thiscond; - } - if ($thiscond>$mincond) { $mincond=$thiscond; } - } - } - foreach (split(/\,/,$next)) { - my ($linkid,$condval)=split(/\:/,$_); - if ($condval>=$mincond) { - my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere); - if ($now>$further) { $further=$now; } - } - } - - } + if ($thiscond>=$mincond) { + if ($next) { + $next.=','.$_.':'.$thiscond; + } else { + $next=$_.':'.$thiscond; + } + if ($thiscond>$mincond) { $mincond=$thiscond; } + } + } + foreach (split(/\,/,$next)) { + my ($linkid,$condval)=split(/\:/,$_); + if ($condval>=$mincond) { + my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere); + if ($now>$further) { $further=$now; } + } + } + } } return $further; } @@ -144,10 +144,10 @@ sub handler { # ------------------------------------------- Set document type for header only if ($r->header_only) { - if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + if ($env{'browser.mathml'}) { + &Apache::loncommon::content_type($r,'text/xml'); } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); } $r->send_http_header; return OK; @@ -157,10 +157,29 @@ sub handler { ['forceselect','launch']); my $number_of_columns = 1; my $requrl=$r->uri; - my $target = $ENV{'form.grade_target'}; + 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'); + $r->send_http_header; + return OK; + } # ----------------------------------------------------------------- Tie db file - if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) { - my $fn=$ENV{'request.course.fn'}; + if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) { + my $fn=$env{'request.course.fn'}; if (-e "$fn.db") { if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) { # ------------------------------------------------------------------- Hash tied @@ -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_'.$_}}=''; + foreach my $rid (@colcont) { + my ($mapid,$resid)=split(/\./,$rid); + $symbhash{$hash{'src_'.$rid}}= + [$hash{'src_'.$rid},$resid]; } } } @@ -193,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=(); @@ -201,8 +226,6 @@ sub handler { my %ssivlink=(); my %ssialink=(); - my %metalink=(); - my %cellemb=(); my $allscript=''; @@ -221,24 +244,59 @@ sub handler { $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1)); foreach (@colcont) { my $src=$hash{'src_'.$_}; - $src=~/\.(\w+)$/; - $metalink{$_}=$src.'.meta'; - $cellemb{$_}=Apache::loncommon::fileembstyle($1); + my ($extension)=($src=~/\.(\w+)$/); + if ($hash{'encrypted_'.$_}) { + $src=&Apache::lonenc::encrypted($src); + } + $cellemb{$_}= + &Apache::loncommon::fileembstyle($extension); if ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell + my ($mapid,$resid)=split(/\./,$_); + my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$src); + my $prefix=$_.'_'; - my %posthash=('request.prefix' => $prefix); - 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 %posthash=('request.prefix' => $prefix, + 'LONCAPA_INTERNAL_no_discussion' => 'true', + 'symb' => $symb); + 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) { + 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') || ($target eq 'tex_answer')) { + $output =~ s/^([^&]+)\\begin{document}//; + $output =~ s/\\end{document}//; +# $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; + } my $parser=HTML::TokeParser->new(\$output); my $token; my $thisdir=$src; @@ -298,12 +356,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|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([\w\.\:]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; + 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) || @@ -322,105 +395,90 @@ sub handler { } } unless ($contents) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('Empty page.'); + $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'). + &Apache::loncommon::end_page()); } else { # ------------------------------------------------------------------ Build page # ---------------------------------------------------------------- Send headers - unless ($target eq 'tex') { + unless (($target eq 'tex') || ($target eq 'tex_answer')) { if ($isxml) { - $r->content_type('text/xml'); - $r->send_http_header; - $r->print($xmlheader); + &Apache::loncommon::content_type($r,'text/xml'); } else { - $r->content_type('text/html'); - $r->send_http_header; - $r->print(''); + &Apache::loncommon::content_type($r,'text/html'); } + $r->send_http_header; # ------------------------------------------------------------------------ Head - $r->print("\n\n".$allmeta); - $allscript=~ - s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; if ($allscript) { - $r->print("\n\n"); + $allscript = + "\n".'\n"; } - $r->print(&Apache::lonxml::registerurl(1,undef)); - $r->print("\n\n"); + if (($nforms) && ($nuploads)) { + $allscript .= &Apache::lonhtmlcommon::file_submissionchk_js(\%turninpaths,\%multiresps); + } # ------------------------------------------------------------------ Start body - if ($isxml) { - $r->print($xmlbody); - } else { - $r->print(''); - } + $r->print(&Apache::loncommon::start_page(undef,$allscript, + {'force_register' => 1, + 'bgcolor' => '#ffffff',})); # ------------------------------------------------------------------ Start form if ($nforms) { - $r->print('
'); + my $fmtag = ' 1) { + $multi = 1; + } + $fmtag .= 'onsubmit="return file_submission_check(this,'."'$turninparent','$multi'".');"'; + } + $fmtag .= ' action="'. + &Apache::lonenc::check_encrypt($requrl) + .'">'; + $r->print($fmtag); } - } else { - $r->print('\documentclass[letterpaper]{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(''); + $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=''. - ''. - ''. - ''. - ''; - if ( - ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && - (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) { - my ($mapid,$resid)=split(/\./,$rid); - my $symb= - &Apache::lonnet::declutter($hash{'map_id_'.$mapid}). - '___'.$resid.'___'. - &Apache::lonnet::declutter($hash{'src_'.$rid}); - $metainfo.= - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''; - } - $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}.'"'); @@ -442,44 +500,46 @@ 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'}. + 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.''); + } elsif (&Apache::lonnet::declutter($hash{'src_'.$rid}) !~/\.(sequence|page)$/) { + $r->print($metainfo.''.$hash{'title_'.$rid}.'
'. + &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}'); +# $r->print('\end{longtable}\strut'); } # ---------------------------------------------------------------- Submit, etc. if ($nforms) { @@ -487,16 +547,20 @@ 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); } + &Apache::lonnet::symblist($requrl,%symbhash); + my ($map,$id,$url)=&Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); + &Apache::lonnet::symblist($map,'last_known'=>[$url,$id]); # -------------------------------------------------------------------- End page } # ------------------------------------------------------------- End render page } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; &Apache::lonsequence::viewmap($r,$requrl); } @@ -511,15 +575,71 @@ sub handler { } } } - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; &Apache::lonsequence::viewmap($r,$requrl); 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}=~/$LONCAPA::assess_re/) && + ($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 @@ -621,5 +741,3 @@ tracetable() : Build page table. =cut - -