version 1.93, 2010/03/16 19:56:02
|
version 1.94, 2010/07/13 00:16:23
|
Line 158 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 242 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 271 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.' }'; |
Line 372 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 396 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')) { |
# I think this is not needed as the header |
# I think this is not needed as the header |
# will be put in for each of the page parts |
# will be put in for each of the page parts |
# by the londefdef.pm now that we are opening up |
# by the londefdef.pm now that we are opening up |
Line 410 sub handler {
|
Line 425 sub handler {
|
# \begin{document}'); |
# \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 { |
Line 419 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 428 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 454 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 475 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++) { |
Line 483 sub handler {
|
Line 498 sub handler {
|
# } |
# } |
} |
} |
} |
} |
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'); |
Line 501 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 { |