--- loncom/interface/lonprintout.pm 2005/02/17 08:29:43 1.361 +++ loncom/interface/lonprintout.pm 2005/03/29 10:21:21 1.372 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.361 2005/02/17 08:29:43 albertel Exp $ +# $Id: lonprintout.pm,v 1.372 2005/03/29 10:21:21 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -781,6 +781,27 @@ sub unsupported { } +# +# Retrieve the hash of page breaks. +# +# Inputs: +# helper - reference to helper object. +# Outputs +# A reference to a page break hash. +# +# + +sub get_page_breaks { + my ($helper) = @_; + my %page_breaks; + + foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) { + $page_breaks{$break} = 1; + } + + return %page_breaks; +} + sub output_data { my ($r,$helper,$rparmhash) = @_; my %parmhash = %$rparmhash; @@ -819,6 +840,20 @@ $bodytag Please stand by while processing your print request, this may take some time ... ENDPART + + + # fetch the pagebreaks and store them in the course environment + # The page breaks will be pulled into the hash %page_breaks which is + # indexed by symb and contains 1's for each break. + + $ENV{'form.pagebreaks'} = $helper->{'VARS'}->{'FINISHPAGE'}; + $ENV{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'}; + &Apache::loncommon::store_course_settings('print', + {'pagebreaks' => 'scalar', + 'lastprinttype' => 'scalar'}); + + my %page_breaks = &get_page_breaks($helper); + my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; my ($result,$selectionmade) = ('',''); my $number_of_columns = 1; #used only for pages to determine the width of the cell @@ -843,7 +878,18 @@ ENDPART my %form; $form{'grade_target'} = 'tex'; $form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth); - + + # If form.showallfoils is set, then request all foils be shown: + # privilege will be enforced both by not allowing the + # check box selecting this option to be presnt unless it's ok, + # and by lonresponse's priv. check. + # The if is here because lonresponse.pm only cares that + # showallfoils is defined, not what the value is. + + if ($helper->{'VARS'}->{'showallfoils'} eq "1") { + $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'}; + } + if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') { #-- single document - problem, page, html, xml, ... my ($currentURL,$cleanURL); @@ -1012,10 +1058,6 @@ ENDPART my $flag_latex_header_remove = 'NO'; my $flag_page_in_sequence = 'NO'; my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; - my %page_breaks; - foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) { - $page_breaks{$break} = 1; - } my $prevassignment=''; &Apache::lonnet::delenv('form.counter'); &Apache::lonxml::init_counter(); @@ -1152,6 +1194,7 @@ ENDPART $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth); $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'}; $moreenv{'problem_split'} = $parmhash{'problem_stream_switch'}; + $moreenv{'suppress_tries'} = $parmhash{'suppress_tries'}; if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';} my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75'); my $student_counter=-1; @@ -1310,6 +1353,7 @@ ENDPART $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /; } + #-- writing .tex file in prtspool my $temp_file; my $identifier = &Apache::loncommon::get_cgi_id(); @@ -1427,15 +1471,14 @@ sub print_resources { $namepostfix="\\\\Name: "; $fullname = "CODE - ".$moreenv->{'CODE'}; } - my %page_breaks; - foreach my $break (split /\|\|\|/,$helper->{'VARS'}->{'FINISHPAGE'}) { - $page_breaks{$break} = 1; - } my $i = 0; #goes through all resources, checks if they are available for #current student, and produces output &Apache::lonnet::delenv('form.counter'); &Apache::lonxml::init_counter(); + + my %page_breaks = &get_page_breaks($helper); + foreach my $curresline (@{$master_seq}) { if (defined $page_breaks{$curresline}) { if($i != 0) { @@ -1555,7 +1598,14 @@ sub handler { # - + # If a figure conversion queue file exists for this user.domain + # we delete it since it can only be bad (if it were good, printout.pl + # would have deleted it the last time around. + + my $conversion_queuefile = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; + if(-e $conversion_queuefile) { + unlink $conversion_queuefile; + } &output_data($r,$helper,\%parmhash); return OK; } @@ -1609,6 +1659,28 @@ sub printHelper { $helper->declareVar('assignment'); $helper->declareVar('style_file'); $helper->declareVar('student_sort'); + $helper->declareVar('FINISHPAGE'); + $helper->declareVar('PRINT_TYPE'); + $helper->declareVar("showallfoils"); + + # The page breaks can get loaded initially from the course environment: + + if((!defined($ENV{"form.CURRENT_STATE"})) || + ($ENV{'form.CURRENT_STATE'} == "START")) { + $helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g. + } + + + + &Apache::loncommon::restore_course_settings('print', + {'pagebreaks' => 'scalar', + 'lastprinttype' => 'scalar'}); + + + if("$helper->{VARS}->{PRINT_TYPE}" eq "$ENV{'form.lastprinttype'}") { + $helper->{VARS}->{FINISHPAGE} = $ENV{'form.pagebreaks'}; + } + # This will persistently load in the data we want from the # very first screen. @@ -1716,8 +1788,8 @@ sub printHelper { $helper->declareVar('SEQUENCE'); # Useful for debugging: Dump the help vars - #$r->print(Dumper($helper->{VARS})); - #$r->print($map); +# $r->print(Dumper($helper->{VARS})); +# $r->print($map); # If we're in a sequence... if (($helper->{'VARS'}->{'construction'} ne '1') && @@ -1783,7 +1855,6 @@ HELPERFRAGMENT suppressEmptySequences='0' addstatus='1' closeallpages='1'> PAGESIZE return $isNotMap; - $map return $symbFilter;