--- loncom/interface/lonprintout.pm 2003/05/28 19:03:22 1.185 +++ 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.185 2003/05/28 19:03:22 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.188 2003/06/18 18:11:16 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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'}; @@ -856,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 { @@ -931,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') { @@ -1288,7 +1289,7 @@ sub render { Left margin: -