--- rat/lonpage.pm 2002/06/26 20:28:30 1.41 +++ rat/lonpage.pm 2005/02/17 09:09:57 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.41 2002/06/26 20:28:30 www Exp $ +# $Id: lonpage.pm,v 1.67 2005/02/17 09:09:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,18 +25,6 @@ # # 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; @@ -46,6 +34,8 @@ use Apache::Constants qw(:common :http); use Apache::lonnet(); use Apache::loncommon(); use Apache::lonxml(); +use Apache::lonlocal; +use Apache::lonmenu; use HTML::TokeParser; use GDBM_File; use Apache::lonsequence; @@ -72,66 +62,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.'&'); + $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; } @@ -145,24 +139,30 @@ sub handler { if ($r->header_only) { if ($ENV{'browser.mathml'}) { - $r->content_type('text/xml'); + &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; } - + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['forceselect','launch']); - + my $number_of_columns = 1; my $requrl=$r->uri; my $target = $ENV{'form.grade_target'}; +# &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 (-e "$fn.db") { - if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) { + if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) { # ------------------------------------------------------------------- Hash tied my $firstres=$hash{'map_start_'.$requrl}; my $lastres=$hash{'map_finish_'.$requrl}; @@ -171,14 +171,7 @@ sub handler { @rows=(); - &tracetable(0,$firstres,'&'.$lastres.'&'); - if ($hash{'src_'.$lastres}) { - my $brepriv= - &Apache::lonnet::allowed('bre',$hash{'src_'.$lastres}); - if (($brepriv eq '2') || ($brepriv eq 'F')) { - $rows[$#rows+1]=''.$lastres; - } - } + &tracetable(0,$firstres,'&'); # ------------------------------------------------------------ Add to symb list @@ -196,7 +189,6 @@ sub handler { # ------------------------------------------------------------------ Page parms - my $number_of_columns = 1; my $j; my $lcm=1; my $contents=0; @@ -229,13 +221,28 @@ sub handler { $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1)); foreach (@colcont) { my $src=$hash{'src_'.$_}; - $src=~/\.(\w+)$/; + my ($extension)=($src=~/\.(\w+)$/); + if ($hash{'encrypted_'.$_}) { + $src=&Apache::lonenc::encrypted($src); + } $metalink{$_}=$src.'.meta'; - $cellemb{$_}=Apache::loncommon::fileembstyle($1); + $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); + my %posthash=('request.prefix' => $prefix, + 'symb' => $symb); + if ($ENV{'form.grade_target'} 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'}; + } if (($ENV{'form.'.$prefix.'submit'}) || ($ENV{'form.all_submit'})) { foreach (keys %ENV) { @@ -247,6 +254,14 @@ sub handler { } } my $output=Apache::lonnet::ssi($src,%posthash); + $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs; + if ($target eq 'tex') { + $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; @@ -330,57 +345,72 @@ sub handler { } } unless ($contents) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('<html><body>Empty page.</body></html>'); + $r->print('<html>'."\n". + '<head>'."\n". + &Apache::lonmenu::registerurl(1,undef)."\n". + '</head>'."\n". + '<body bgcolor="#FFFFFF" onLoad="' + .&Apache::lonmenu::loadevents. + '" onUnload="'.&Apache::lonmenu::unloadevents.'">'. + &Apache::lonmenu::menubuttons(undef,$target,1) + ); + $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. '); + $r->print('<br /><br />'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course').'.</body></html>'); } else { # ------------------------------------------------------------------ Build page # ---------------------------------------------------------------- Send headers unless ($target eq 'tex') { if ($isxml) { - $r->content_type('text/xml'); + &Apache::loncommon::content_type($r,'text/xml'); $r->send_http_header; $r->print($xmlheader); } else { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print('<html>'); } # ------------------------------------------------------------------------ Head $r->print("\n<head>\n".$allmeta); - $allscript=~ - s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; if ($allscript) { $r->print("\n<script language='JavaScript'>\n". $allscript."\n</script>\n"); } - $r->print(&Apache::lonxml::registerurl(1,undef)); + $r->print(&Apache::lonmenu::registerurl(1,undef)); $r->print("\n</head>\n"); # ------------------------------------------------------------------ Start body if ($isxml) { $r->print($xmlbody); } else { - $r->print('<body bgcolor="#FFFFFF" onLoad="'.&Apache::lonxml::loadevents.'" onUnload="'.&Apache::lonxml::unloadevents.'">'); + $r->print( + '<body bgcolor="#FFFFFF" onLoad="'.&Apache::lonmenu::loadevents. + '" onUnload="'.&Apache::lonmenu::unloadevents.'">'. + &Apache::lonmenu::menubuttons(undef,$target,1) + ); } # ------------------------------------------------------------------ Start form if ($nforms) { $r->print('<form method="post" action="'. - $requrl.'">'); + &Apache::lonenc::check_encrypt($requrl) + .'">'); } - } else { - $r->print('\documentclass[letterpaper]{article} + } elsif ($target eq 'tex') { + $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{tabular}INSERT'); + $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead '); + if ($number_of_columns le $lcm) {$number_of_columns=$lcm;}; } else { - $r->print('<table cols="'.$lcm.'" border="0">'); + $r->print('<table width="100%" cols="'.$lcm.'" border="0">'); } for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { @@ -391,17 +421,29 @@ sub handler { my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { my $rid=$colcont[$j]; - my $metainfo='<a href="'. - $metalink{$rid}.'" target="LONcatInfo">'. - '<img src="/adm/lonMisc/cat_button.gif" border=0>'. - '</img></a><a href="/adm/evaluate?postdata='. - &Apache::lonnet::escape(&Apache::lonnet::declutter($hash{'src_'.$rid})) - .'" target="LONcatInfo">'. - '<img src="/adm/lonMisc/eval_button.gif" border=0>'. - '</img></a>'; + 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 ='<a name="'.&Apache::lonnet::escape($symb).'" />'. + '<a href="'.$metalink{$rid}.'" target="LONcatInfo">'. + '<img src="/adm/lonMisc/cat_button.gif" border=0>'. + '</img></a>'; + } + $metainfo .= '<a href="/adm/evaluate?postdata='. + &Apache::lonnet::escape($esrc). + '" target="LONcatInfo">'. + '<img src="/adm/lonMisc/eval_button.gif" border=0>'. + '</img></a>'; if ( ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && - (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) { + (&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}). @@ -409,15 +451,18 @@ sub handler { &Apache::lonnet::declutter($hash{'src_'.$rid}); $metainfo.= '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb). - '&command=submission" target="LONcatInfo">'. +# '&command=submission" target="LONcatInfo">'. + '&command=submission">'. '<img src="/adm/lonMisc/subm_button.gif" border=0>'. '</img></a>'. '<a href="/adm/grades?symb='.&Apache::lonnet::escape($symb). - '&command=gradingmenu" target="LONcatInfo">'. +# '&command=gradingmenu" target="LONcatInfo">'. + '&command=gradingmenu">'. '<img src="/adm/lonMisc/pgrd_button.gif" border=0>'. '</img></a>'. '<a href="/adm/parmset?symb='.&Apache::lonnet::escape($symb). - '" target="LONcatInfo">'. +# '" target="LONcatInfo">'. + '" >'. '<img src="/adm/lonMisc/pprm_button.gif" border=0>'. '</img></a>'; } @@ -466,26 +511,30 @@ sub handler { } elsif ($cellemb{$rid} eq 'emb') { $r->print('>'.$metainfo.'<embed src="'. $hash{'src_'.$rid}.'"></embed>'); + } elsif (&Apache::lonnet::declutter($hash{'src_'.$rid}) !~/\.(sequence|page)$/) { + $r->print($metainfo.'<b>'.$hash{'title_'.$rid}.'</b><br />'. + &mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'</p><p><table>'. + &Apache::londocs::entryline(0,&mt("Click to download or use your browser's Save Link function"),'/'.&Apache::lonnet::declutter($hash{'src_'.$rid})).'</table></p><br />'); } unless ($target eq 'tex') { $r->print('</td>'); } else { - $number_of_columns++; - $r->print(' & '); + for (my $incol=1;$incol<=$avespan;$incol++) { + $r->print(' & '); + } } } unless ($target eq 'tex') { $r->print('</tr>'); } else { - $number_of_columns = 1; - $r->print('REMOVE\\\\'); + $r->print('REMOVETHEHEADOFLONGTABLE\\\\'); } } } unless ($target eq 'tex') { $r->print("\n</table>"); } else { - $r->print('\end{tabular}'); + $r->print('\end{longtable}\strut'); } # ---------------------------------------------------------------- Submit, etc. if ($nforms) { @@ -498,11 +547,12 @@ sub handler { } else { $r->print('\end{document}'.$number_of_columns); } + &Apache::lonnet::symblist($requrl,%symbhash); # -------------------------------------------------------------------- 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); } @@ -517,7 +567,7 @@ 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;