--- loncom/interface/lonprintout.pm 2003/05/27 19:00:35 1.184 +++ loncom/interface/lonprintout.pm 2003/06/18 18:11:16 1.188 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.184 2003/05/27 19:00:35 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.188 2003/06/18 18:11:16 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -469,7 +469,7 @@ sub latex_corrections { my ($number_of_columns,$result) = @_; - $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g; +# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g; $result =~ s/\$number_of_columns/$number_of_columns/g; $result =~ s/(\\end{document})/\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License $1/; $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g; @@ -502,13 +502,14 @@ sub latex_corrections { sub output_data { my ($r,$helper,$rparmhash) = @_; my %parmhash = %$rparmhash; + my $bodytag=&Apache::loncommon::bodytag('Preparing Printout'); $r->print(< LON-CAPA output for printing - -
+$bodytag +Please stand by while processing your print request, this may take some time ... ENDPART my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; @@ -537,10 +538,10 @@ ENDPART #-- single document - problem, page, html, xml, ... my $currentURL; if ($helper->{'VARS'}->{'construction'} ne '1') { - #prins published resource + #prints published resource $currentURL=$helper->{'VARS'}->{'postdata'}; } else { - #prins resource from the construction space + #prints resource from the construction space $currentURL=$helper->{'VARS'}->{'filename'}; $currentURL=~s/\/home\//\/~/; $currentURL=~s/public_html\///; @@ -746,9 +747,6 @@ ENDPART } #-------------------------------------------------------- corrections for the different page formats $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'}); -# if ($layout eq 'CBI') { -# $laystyle = 'album'; -# } $result = &latex_corrections($number_of_columns,$result); # #changes page's parameters for the one column output # if ($ENV{'form.numberofcolumns'} == 1) { @@ -859,7 +857,7 @@ sub printHelper { # very first screen. # Detect whether we're coming from construction space if ($ENV{'form.postdata'} =~ /http:\/\// ) { - $ENV{'form.postdata'} =~ /http:\/\/[a-zA-Z.]+\/~([a-zA-Z0-9]+)\/(.*)/; + $ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/; $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2"; $helper->{VARS}->{'construction'} = 1; } else { @@ -934,7 +932,7 @@ sub printHelper { push @{$printChoices}, ["$resourceTitle (prints what you just saw on the screen)", 'current_document', 'PAGESIZE']; } - $r->print($helper->{VARS}->{'postdata'}); +# $r->print($helper->{VARS}->{'postdata'}); # If we're in a sequence... if ($helper->{'VARS'}->{'construction'} ne '1') { @@ -1291,7 +1289,7 @@ sub render { Left margin: -