version 1.86, 2007/09/26 00:32:55
|
version 1.94, 2010/07/13 00:16:23
|
Line 27
|
Line 27
|
# |
# |
### |
### |
|
|
|
|
|
|
|
|
package Apache::lonpage; |
package Apache::lonpage; |
|
|
use strict; |
use strict; |
Line 78 sub tracetable {
|
Line 81 sub tracetable {
|
my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}}; |
my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}}; |
$sofar= |
$sofar= |
&tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}}, |
&tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}}, |
'&'.$frid.'&'); |
'&'.$frid.$beenhere); |
$sofar++; |
$sofar++; |
if ($hash{'src_'.$frid}) { |
if ($hash{'src_'.$frid}) { |
my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid}); |
my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid}); |
Line 155 sub handler {
|
Line 158 sub handler {
|
my $number_of_columns = 1; |
my $number_of_columns = 1; |
my $requrl=$r->uri; |
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"); |
# &Apache::lonnet::logthis("Got a target of $target"); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
Line 239 sub handler {
|
Line 255 sub handler {
|
my %posthash=('request.prefix' => $prefix, |
my %posthash=('request.prefix' => $prefix, |
'LONCAPA_INTERNAL_no_discussion' => 'true', |
'LONCAPA_INTERNAL_no_discussion' => 'true', |
'symb' => $symb); |
'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{'grade_target'}=$env{'form.grade_target'}; |
$posthash{'textwidth'}=$env{'form.textwidth'}; |
$posthash{'textwidth'}=$env{'form.textwidth'}; |
$posthash{'problem_split'}=$env{'form.problem_split'}; |
$posthash{'problem_split'}=$env{'form.problem_split'}; |
$posthash{'latex_type'}=$env{'form.latex_type'}; |
$posthash{'latex_type'}=$env{'form.latex_type'}; |
$posthash{'rndseed'}=$env{'form.rndseed'}; |
$posthash{'rndseed'}=$env{'form.rndseed'}; |
|
$posthash{'answer_output_mode'} = $env{'form.answer_output_mode'}; |
} |
} |
my $submitted=exists($env{'form.all_submit'}); |
my $submitted=exists($env{'form.all_submit'}); |
if (!$submitted) { |
if (!$submitted) { |
Line 268 sub handler {
|
Line 286 sub handler {
|
} |
} |
my $output=Apache::lonnet::ssi($src,%posthash); |
my $output=Apache::lonnet::ssi($src,%posthash); |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
if ($target eq 'tex') { |
if (($target eq 'tex') || ($target eq 'tex_answer')) { |
$output =~ s/^([^&]+)\\begin{document}//; |
$output =~ s/^([^&]+)\\begin{document}//; |
$output =~ s/\\end{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 |
#some additional cleanup necessary for LateX (due to limitations of table environment |
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; |
$output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g; |
} |
} |
Line 339 sub handler {
|
Line 357 sub handler {
|
} |
} |
$thisdir=~s/\/[^\/]*$//; |
$thisdir=~s/\/[^\/]*$//; |
foreach (@rlinks) { |
foreach (@rlinks) { |
unless (($_=~/^http:\/\//i) || |
unless (($_=~/^https?\:\/\//i) || |
($_=~/^\//) || |
($_=~/^\//) || |
($_=~/^javascript:/i) || |
($_=~/^javascript:/i) || |
($_=~/^mailto:/i) || |
($_=~/^mailto:/i) || |
Line 369 sub handler {
|
Line 387 sub handler {
|
# ------------------------------------------------------------------ Build page |
# ------------------------------------------------------------------ Build page |
|
|
# ---------------------------------------------------------------- Send headers |
# ---------------------------------------------------------------- Send headers |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
if ($isxml) { |
if ($isxml) { |
&Apache::loncommon::content_type($r,'text/xml'); |
&Apache::loncommon::content_type($r,'text/xml'); |
} else { |
} else { |
Line 393 sub handler {
|
Line 411 sub handler {
|
&Apache::lonenc::check_encrypt($requrl) |
&Apache::lonenc::check_encrypt($requrl) |
.'">'); |
.'">'); |
} |
} |
} elsif ($target eq 'tex') { |
} elsif (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('\documentclass{article} |
# I think this is not needed as the header |
\newcommand{\keephidden}[1]{} |
# will be put in for each of the page parts |
\usepackage[dvips]{graphicx} |
# by the londefdef.pm now that we are opening up |
\usepackage{epsfig} |
# the parts of a page. |
\usepackage{calc} |
#$r->print('\documentclass{article} |
\usepackage{longtable} |
# \newcommand{\keephidden}[1]{} |
\begin{document}'); |
# \usepackage[dvips]{graphicx} |
|
# \usepackage{epsfig} |
|
# \usepackage{calc} |
|
# \usepackage{longtable} |
|
# \begin{document}'); |
} |
} |
# ----------------------------------------------------------------- Start table |
# ----------------------------------------------------------------- Start table |
if ($target eq 'tex') { |
if (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead '); |
# # $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead '); |
if ($number_of_columns le $lcm) {$number_of_columns=$lcm;}; |
if ($number_of_columns le $lcm) {$number_of_columns=$lcm;}; |
} else { |
} else { |
$r->print('<table width="100%" cols="'.$lcm.'" border="0">'); |
$r->print('<table width="100%" cols="'.$lcm.'" border="0">'); |
Line 412 sub handler {
|
Line 434 sub handler {
|
# generate rows |
# generate rows |
for ($i=0;$i<=$#rows;$i++) { |
for ($i=0;$i<=$#rows;$i++) { |
if ($rows[$i]) { |
if ($rows[$i]) { |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print("\n<tr>"); |
$r->print("\n<tr>"); |
} |
} |
my @colcont=split(/\&/,$rows[$i]); |
my @colcont=split(/\&/,$rows[$i]); |
Line 421 sub handler {
|
Line 443 sub handler {
|
my $rid=$colcont[$j]; |
my $rid=$colcont[$j]; |
|
|
my $metainfo =&get_buttons(\%hash,$rid).'<br />'; |
my $metainfo =&get_buttons(\%hash,$rid).'<br />'; |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('<td colspan="'.$avespan.'"'); |
$r->print('<td colspan="'.$avespan.'"'); |
} |
} |
if ($cellemb{$rid} eq 'ssi') { |
if ($cellemb{$rid} eq 'ssi') { |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
if ($ssibgcolor{$rid}) { |
if ($ssibgcolor{$rid}) { |
$r->print(' bgcolor="'. |
$r->print(' bgcolor="'. |
$ssibgcolor{$rid}.'"'); |
$ssibgcolor{$rid}.'"'); |
Line 447 sub handler {
|
Line 469 sub handler {
|
$r->print('>'); |
$r->print('>'); |
} |
} |
$r->print($ssibody{$rid}); |
$r->print($ssibody{$rid}); |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('</font>'); |
$r->print('</font>'); |
} |
} |
if ($env{'course.'. |
if ($env{'course.'. |
$env{'request.course.id'}. |
$env{'request.course.id'}. |
'.pageseparators'} eq 'yes') { |
'.pageseparators'} eq 'yes') { |
unless($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('<hr />'); |
$r->print('<hr />'); |
} |
} |
} |
} |
Line 468 sub handler {
|
Line 490 sub handler {
|
&mt('It is recommended that you use an up-to-date virus scanner before handling this file.').'</p><p><table>'. |
&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 />'); |
&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') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('</td>'); |
$r->print('</td>'); |
} else { |
} else { |
for (my $incol=1;$incol<=$avespan;$incol++) { |
# for (my $incol=1;$incol<=$avespan;$incol++) { |
$r->print(' & '); |
# $r->print(' & '); |
} |
# } |
} |
} |
} |
} |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print('</tr>'); |
$r->print('</tr>'); |
} else { |
} else { |
$r->print('REMOVETHEHEADOFLONGTABLE\\\\'); |
# $r->print('REMOVETHEHEADOFLONGTABLE\\\\'); |
} |
} |
} |
} |
} |
} |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print("\n</table>"); |
$r->print("\n</table>"); |
} else { |
} else { |
$r->print('\end{longtable}\strut'); |
# $r->print('\end{longtable}\strut'); |
} |
} |
# ---------------------------------------------------------------- Submit, etc. |
# ---------------------------------------------------------------- Submit, etc. |
if ($nforms) { |
if ($nforms) { |
Line 494 sub handler {
|
Line 516 sub handler {
|
'<input name="all_submit" value="Submit All" type="'. |
'<input name="all_submit" value="Submit All" type="'. |
(($nforms>1)?'submit':'hidden').'"></input></form>'); |
(($nforms>1)?'submit':'hidden').'"></input></form>'); |
} |
} |
unless ($target eq 'tex') { |
unless (($target eq 'tex') || ($target eq 'tex_answer')) { |
$r->print(&Apache::loncommon::end_page({'discussion' |
$r->print(&Apache::loncommon::end_page({'discussion' |
=> 1,})); |
=> 1,})); |
} else { |
} else { |
Line 531 sub handler {
|
Line 553 sub handler {
|
sub get_buttons { |
sub get_buttons { |
my ($hash,$rid) = @_; |
my ($hash,$rid) = @_; |
|
|
# which icons do we use? |
|
my $extension='png'; |
|
if ($env{'environment.icons'} eq 'classic') { $extension='gif'; } |
|
|
|
my $metainfo = ''; |
my $metainfo = ''; |
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); |
my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid}); |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
Line 551 sub get_buttons {
|
Line 569 sub get_buttons {
|
|| !$hash->{'encrypted_'.$rid})) { |
|| !$hash->{'encrypted_'.$rid})) { |
$metainfo .='<a name="'.&escape($symb).'" />'. |
$metainfo .='<a name="'.&escape($symb).'" />'. |
'<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'. |
'<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'. |
'<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/cat_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
} |
} |
$metainfo .= '<a href="/adm/evaluate?postdata='. |
$metainfo .= '<a href="/adm/evaluate?postdata='. |
&escape($esrc). |
&escape($esrc). |
'" target="LONcatInfo">'. |
'" target="LONcatInfo">'. |
'<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/eval_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && |
if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && |
($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { |
($hash->{'src_'.$rid} !~ m-^/uploaded/-)) { |
Line 567 sub get_buttons {
|
Line 585 sub get_buttons {
|
'<a href="/adm/grades?symb='.&escape($symb). |
'<a href="/adm/grades?symb='.&escape($symb). |
# '&command=submission" target="LONcatInfo">'. |
# '&command=submission" target="LONcatInfo">'. |
'&command=submission">'. |
'&command=submission">'. |
'<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/subm_button.png" class="LC_icon" />'. |
'</a>'. |
'</a>'. |
'<a href="/adm/grades?symb='.&escape($symb). |
'<a href="/adm/grades?symb='.&escape($symb). |
# '&command=gradingmenu" target="LONcatInfo">'. |
# '&command=gradingmenu" target="LONcatInfo">'. |
'&command=gradingmenu">'. |
'&command=gradingmenu">'. |
'<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/pgrd_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
} |
} |
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { |
Line 580 sub get_buttons {
|
Line 598 sub get_buttons {
|
'<a href="/adm/parmset?symb='.&escape($symb). |
'<a href="/adm/parmset?symb='.&escape($symb). |
# '" target="LONcatInfo">'. |
# '" target="LONcatInfo">'. |
'" >'. |
'" >'. |
'<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'. |
'<img src="/adm/lonMisc/pprm_button.png" class="LC_icon" />'. |
'</a>'; |
'</a>'; |
} |
} |
} |
} |
Line 590 sub get_buttons {
|
Line 608 sub get_buttons {
|
1; |
1; |
__END__ |
__END__ |
|
|
|
|
=head1 NAME |
=head1 NAME |
|
|
Apache::lonpage - Page Handler |
Apache::lonpage - Page Handler |
Line 691 tracetable() : Build page table.
|
Line 710 tracetable() : Build page table.
|
=cut |
=cut |
|
|
|
|
|
|
|
|