version 1.557.2.1, 2009/07/14 09:30:20
|
version 1.557.2.3, 2009/07/16 11:12:30
|
Line 197 sub include_pdf {
|
Line 197 sub include_pdf {
|
|
|
|
|
# |
# |
# ssi_with_retries - Does the server side include of a resource. |
# ssi_with_retries- Does the server side include of a resource. |
# if the ssi call returns an error we'll retry it up to |
# if the ssi call returns an error we'll retry it up to |
# the number of times requested by the caller. |
# the number of times requested by the caller. |
# If we still have a proble, no text is appended to the |
# If we still have a proble, no text is appended to the |
Line 943 sub old_character_chart {
|
Line 943 sub old_character_chart {
|
$result =~ s/&(ldquo|#8220);/\`\`/g; |
$result =~ s/&(ldquo|#8220);/\`\`/g; |
$result =~ s/&(rdquo|#8221);/\'\'/g; |
$result =~ s/&(rdquo|#8221);/\'\'/g; |
|
|
&Apache::lonnet::logthis("After pass through old character chart: '$result'"); |
|
|
|
|
|
return $result; |
return $result; |
Line 1307 sub unsupported {
|
Line 1306 sub unsupported {
|
return $result; |
return $result; |
} |
} |
|
|
|
# |
|
# Map from helper layout style to the book/album: |
|
# |
|
sub map_laystyle { |
|
my ($laystyle) = @_; |
|
if ($laystyle eq 'L') { |
|
$laystyle='album'; |
|
} else { |
|
$laystyle='book'; |
|
} |
|
return $laystyle; |
|
} |
|
|
sub print_page_in_course { |
sub print_page_in_course { |
my ($helper, $currentURL, $resources) = @_; |
my ($helper, $rparmhash, $currentURL, $resources) = @_; |
|
my %parmhash = %$rparmhash; |
my @page_resources = @$resources; |
my @page_resources = @$resources; |
my $mode = $helper->{'VARS'}->{'LATEX_TYPE'}; |
my $mode = $helper->{'VARS'}->{'LATEX_TYPE'}; |
my $symb = $helper->{'VARS'}->{'symb'}; |
my $symb = $helper->{'VARS'}->{'symb'}; |
|
|
|
|
|
my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; |
|
|
|
|
|
my @temporary_array=split /\|/,$format_from_helper; |
|
my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array; |
|
$laystyle = &map_laystyle($laystyle); |
|
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle, |
|
$numberofcolumns); |
|
my $LaTeXwidth=&recalcto_mm($textwidth); |
|
|
|
|
if ($mode ne '') {$mode='\\'.$mode} |
if ($mode ne '') {$mode='\\'.$mode} |
my $result.= &print_latex_header($mode); |
my $result.= &print_latex_header($mode); |
if ($currentURL=~m|^(/adm/wrapper/)?ext/|) { |
if ($currentURL=~m|^(/adm/wrapper/)?ext/|) { |
$currentURL=~s|^(/adm/wrapper/)?ext/|http://|; |
$currentURL=~s|^(/adm/wrapper/)?ext/|http://|; |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$title = &Apache::lonxml::latex_special_symbols($title); |
$title = &Apache::lonxml::latex_special_symbols($title); |
$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' '; |
|
} else { |
} else { |
$result.=$currentURL; |
$result.=$currentURL; |
} |
} |
|
$result .= '\\\\'; |
|
|
|
if ($helper->{'VARS'}->{'style_file'}=~/\w/) { |
|
&Apache::lonnet::appenv({'construct.style' => |
|
$helper->{'VARS'}->{'style_file'}}); |
|
} elsif ($env{'construct.style'}) { |
|
&Apache::lonnet::delenv('construct.style'); |
|
} |
|
|
# First is theo verall page description. This is then followed by the |
# First is theo verall page description. This is then followed by the |
# components of the page. Each of which must be printed independently. |
# components of the page. Each of which must be printed independently. |
|
|
my $the_page = shift(@page_resources); |
my $the_page = shift(@page_resources); |
$result .= "URL: $currentURL " .'\\\\'; |
|
|
|
foreach my $resource (@page_resources) { |
foreach my $resource (@page_resources) { |
my $resource_src = $resource->src(); |
my $resource_src = $resource->src(); # Essentially the URL of the resource. |
my $resource_symb = $resource->symb(); |
$result .= $resource->title() . '\\\\'; |
$resource_symb = &Apache::lonnet::clutter($resource_symb); |
|
my $resource_kind = $resource->kind(); |
# Recurse if a .page: |
my $resource_title = $resource->title(); |
|
|
if ($resource_src =~ /.page$/i) { |
$result .= &Apache::lonxml::latex_special_symbols("Src: $resource_src symb: $resource_symb "); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
$result .= &Apache::lonxml::latex_special_symbols("Kind: $resource_kind Title: $resource_title"); |
my @page_resources = $navmap->retrieveResources($resource_src); |
$result .= '\\\\'; |
$result .= &print_page_in_course($helper, $rparmhash, |
|
$resource_src, \@page_resources); |
|
} |
|
# these resources go through the XML transformer: |
|
|
|
elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm\xhtml|xhtm)$/) { |
|
my $urlp = &Apache::lonnet::clutter($resource_src); |
|
my %form; |
|
my %moreenv; |
|
|
|
&Apache::lonxml::remember_problem_counter(); |
|
$moreenv{'request.filename'}=$urlp; |
|
if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';} |
|
|
|
$form{'grade_target'} = 'tex'; |
|
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth); |
|
$form{'pdfFormFiels'} = $pdfFormFields; # |
|
$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'}; |
|
|
|
$form{'problem_split'}=$parmhash{'problem_stream_switch'}; |
|
$form{'suppress_tries'}=$parmhash{'suppress_tries'}; |
|
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; |
|
$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'}; |
|
$form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'}; |
|
if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') || |
|
($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) { |
|
$form{'problem_split'}='yes'; |
|
} |
|
my $rndseed = time; |
|
if ($helper->{'VARS'}->{'curseed'}) { |
|
$rndseed=$helper->{'VARS'}->{'curseed'}; |
|
} |
|
$form{'rndseed'}=$rndseed; |
|
&Apache::lonnet::appenv(\%moreenv); |
|
|
|
&Apache::lonxml::clear_problem_counter(); |
|
|
|
my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form); |
|
|
|
# There seems to be an extraneous \vskip 1mm \\\\ : |
|
|
|
$texversion =~ s/^\\vskip 1mm \\\\\\\\//; |
|
|
|
# current document with answers.. no need to encap in minipage |
|
# since there's only one answer. |
|
|
|
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || |
|
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { |
|
$form{'problem_split'}=$parmhash{'problem_stream_switch'}; |
|
$form{'grade_target'}='answer'; |
|
$form{'answer_output_mode'}='tex'; |
|
$form{'rndseed'}=$rndseed; |
|
if ($helper->{'VARS'}->{'probstatus'} eq 'exam') { |
|
$form{'problemtype'}='exam'; |
|
} |
|
$resources_printed .= $currentURL.':'; |
|
my $answer=&ssi_with_retries($currentURL,$ssi_retry_count, %form); |
|
|
|
|
|
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { |
|
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; |
|
} else { |
|
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); |
|
if ($helper->{'VARS'}->{'construction'} ne '1') { |
|
my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}); |
|
$title = &Apache::lonxml::latex_special_symbols($title); |
|
$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm '; |
|
$texversion.=&path_to_problem($urlp,$LaTeXwidth); |
|
} else { |
|
$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm '; |
|
my $URLpath=$urlp; |
|
$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/; |
|
$texversion.=&path_to_problem($URLpath,$LaTeXwidth); |
|
} |
|
$texversion.='\vskip 1 mm '.$answer.'\end{document}'; |
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
# Print annotations. |
|
|
|
|
|
if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') { |
|
my $annotation .= &annotate($currentURL); |
|
$texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/; |
|
} |
|
|
|
if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') { |
|
$texversion=&IndexCreation($texversion,$currentURL); |
|
} |
|
if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') { |
|
$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /; |
|
|
|
} |
|
$result .= $texversion; |
|
if ($currentURL=~m/\.page\s*$/) { |
|
($result,$numberofcolumns) = &page_cleanup($result); |
|
} |
|
} |
} |
} |
|
|
$result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}'; |
$result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}'; |
Line 1614 ENDPART
|
Line 1745 ENDPART
|
my $number_of_columns = 1; #used only for pages to determine the width of the cell |
my $number_of_columns = 1; #used only for pages to determine the width of the cell |
my @temporary_array=split /\|/,$format_from_helper; |
my @temporary_array=split /\|/,$format_from_helper; |
my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array; |
my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array; |
if ($laystyle eq 'L') { |
|
$laystyle='album'; |
$laystyle = &map_laystyle($laystyle); |
} else { |
|
$laystyle='book'; |
|
} |
|
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns); |
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns); |
my $assignment = $env{'form.assignment'}; |
my $assignment = $env{'form.assignment'}; |
my $LaTeXwidth=&recalcto_mm($textwidth); |
my $LaTeXwidth=&recalcto_mm($textwidth); |
Line 1812 ENDPART
|
Line 1940 ENDPART
|
|
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
my @page_resources = $navmap->retrieveResources($cleanURL); |
my @page_resources = $navmap->retrieveResources($cleanURL); |
$result .= &print_page_in_course($helper, $cleanURL, \@page_resources); |
$result .= &print_page_in_course($helper, $rparmhash, |
|
$cleanURL, \@page_resources); |
|
|
|
|
} else { |
} else { |
Line 3789 sub render {
|
Line 3918 sub render {
|
my ($laystyle, $cols, $papersize) = split(/\|/, $format); |
my ($laystyle, $cols, $papersize) = split(/\|/, $format); |
($papersize) = split(/ /, $papersize); |
($papersize) = split(/ /, $papersize); |
|
|
|
$laystyle = &Apache::lonprintout::map_laystyle($laystyle); |
|
|
if ($laystyle eq 'L') { |
|
$laystyle = 'album'; |
|
} else { |
|
$laystyle = 'book'; |
|
} |
|
|
|
|
|
my %size; |
my %size; |
Line 3875 sub preprocess {
|
Line 4000 sub preprocess {
|
($papersize) = split(/ /, $papersize); |
($papersize) = split(/ /, $papersize); |
|
|
|
|
if ($laystyle eq 'L') { |
$laystyle = &map_laystyle($laystyle); |
$laystyle = 'album'; |
|
} else { |
|
$laystyle = 'book'; |
|
} |
|
# Figure out some good defaults for the print out and set them: |
# Figure out some good defaults for the print out and set them: |
|
|
my %size; |
my %size; |