--- loncom/interface/lonprintout.pm 2003/05/15 20:45:40 1.182 +++ loncom/interface/lonprintout.pm 2003/06/19 14:54:51 1.189 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.182 2003/05/15 20:45:40 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.189 2003/06/19 14:54:51 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; @@ -500,14 +500,16 @@ sub latex_corrections { sub output_data { - my ($r,$helper) = @_; + 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'}; @@ -536,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\///; @@ -599,6 +601,7 @@ ENDPART $form{'grade_target'}='tex'; $form{'textwidth'}=$LaTeXwidth; $form{'symb'}=$master_seq[$i]; + $form{'problem_split'}=$parmhash{'problem_stream_switch'}; #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { @@ -744,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) { @@ -797,8 +797,17 @@ sub handler { # $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-
'); # } # return OK; - - &output_data($r,$helper); + + my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); +# $r->print('
START '.$ENV{'request.course.fn'}.' FINISH
'); +# my $key; +# foreach $key (keys %parmhash) { +# $r->print(' '.$key.'->'.$parmhash{$key}.'<-
'); +# } +# return OK; + + + &output_data($r,$helper,\%parmhash); return OK; } @@ -848,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 { @@ -904,6 +913,8 @@ sub printHelper { if (not $helper->{VARS}->{'construction'}) { $subdir='/home/httpd/html/res/'.$subdir; } + # "Remove all duplicate slashes." + $subdir =~ s|/+|/|g; # What can be printed is a very dynamic decision based on # lots of factors. So we need to dynamically build this list. @@ -923,7 +934,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') { @@ -992,9 +1003,9 @@ HELPERFRAGMENT
How should the results be printed?
- Start student assignment from new page (add pagefeed after each student) - Add one emty page after each student assignment - Add two emty page after each student assignment + Start each student's assignment on a new page (add a pagefeed after each assignment) + Add one empty page after each student's assignment + Add two empty pages after each student's assignment CHOOSE_STUDENTS @@ -1280,7 +1291,7 @@ sub render { Left margin: -