--- loncom/interface/lonprintout.pm 2005/02/17 08:29:43 1.361 +++ loncom/interface/lonprintout.pm 2005/04/07 07:03:23 1.374 @@ -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.374 2005/04/07 07:03:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -534,8 +534,8 @@ sub page_format { sub get_name { my ($uname,$udom)=@_; - if (!defined($uname)) { $uname=$ENV{'user.name'}; } - if (!defined($udom)) { $udom=$ENV{'user.domain'}; } + if (!defined($uname)) { $uname=$env{'user.name'}; } + if (!defined($udom)) { $udom=$env{'user.domain'}; } my $plainname=&Apache::loncommon::plainname($uname,$udom); if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; } $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header'); @@ -544,8 +544,8 @@ sub get_name { sub get_course { my $courseidinfo; - if (defined($ENV{'request.course.id'})) { - $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header'); + if (defined($env{'request.course.id'})) { + $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header'); } return $courseidinfo; } @@ -607,7 +607,7 @@ sub page_cleanup { sub details_for_menu { my ($helper)=@_; - my $postdata=$ENV{'form.postdata'}; + my $postdata=$env{'form.postdata'}; if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; } my $name_of_resource = &Apache::lonnet::gettitle($postdata); my $symbolic = &Apache::lonnet::symbread($postdata); @@ -618,9 +618,9 @@ sub details_for_menu { $map =~ m|([^/]+)$|; $name_of_sequence = $1; } - my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'}); + my $name_of_map = &Apache::lonnet::gettitle($env{'request.course.uri'}); if ($name_of_map =~ /^\s*$/) { - $ENV{'request.course.uri'} =~ m|([^/]+)$|; + $env{'request.course.uri'} =~ m|([^/]+)$|; $name_of_map = $1; } return ($name_of_resource,$name_of_sequence,$name_of_map); @@ -695,7 +695,7 @@ sub IndexCreation { sub print_latex_header { my $mode=shift; my $output='\documentclass[letterpaper]{article}'; - if (($mode eq 'batchmode') || (!$ENV{'request.role.adv'})) { + if (($mode eq 'batchmode') || (!$env{'request.role.adv'})) { $output.='\batchmode'; } $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n". @@ -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 @@ -830,7 +865,7 @@ ENDPART $laystyle='book'; } 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 @print_array=(); my @student_names=(); @@ -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); @@ -866,8 +912,8 @@ ENDPART $moreenv{'request.filename'}=$cleanURL; if ($helper->{'VARS'}->{'style_file'}=~/\w/) { $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'}; - my $dom = $ENV{'user.domain'}; - my $user = $ENV{'user.name'}; + my $dom = $env{'user.domain'}; + my $user = $env{'user.name'}; my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user); } if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';} @@ -949,7 +995,7 @@ ENDPART $form{'answer_output_mode'}='tex'; $form{'rndseed'}=$rndseed; $form{'problem_split'}=$parmhash{'problem_stream_switch'}; - if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';} + if ($urlp=~/\/res\//) {$env{'request.state'}='published';} my $answer=&Apache::lonnet::ssi($urlp,%form); if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; @@ -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(); @@ -1046,11 +1088,11 @@ ENDPART $flag_page_in_sequence = 'YES'; } my $lonidsdir=$r->dir_config('lonIDsDir'); - my $envfile=$ENV{'user.environment'}; + my $envfile=$env{'user.environment'}; $envfile=~/\/([^\/]+)\.id$/; $envfile=$1; &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile); - my $current_counter=$ENV{'form.counter'}; + my $current_counter=$env{'form.counter'}; if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { $form{'grade_target'}='answer'; @@ -1152,12 +1194,13 @@ 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; foreach my $person (@students) { - my $duefile="/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due"; + my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due"; if (-e $duefile) { my $temp_file = Apache::File->new('>>'.$duefile); print $temp_file "1969\n"; @@ -1179,8 +1222,8 @@ ENDPART $result .= $print_array[0].' \end{document}'; } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon') || ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ) { - my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; - my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; + my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'}; my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'}; my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'}; my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'}; @@ -1310,10 +1353,11 @@ 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(); - my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".$identifier.".tex"; + my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_".$identifier.".tex"; if (!($#print_array>0)) { unless ($temp_file = Apache::File->new('>'.$filename)) { $r->log_error("Couldn't open $filename for output $!"); @@ -1353,9 +1397,9 @@ ENDPART if ($#student_names>-1) { $student_names=$student_names[0].'_ENDPERSON_'; } else { - my $fullname = &get_name($ENV{'user.name'},$ENV{'user.domain'}); - $student_names=join(':',$ENV{'user.name'},$ENV{'user.domain'}, - $ENV{'request.course.sec'},$fullname). + my $fullname = &get_name($env{'user.name'},$env{'user.domain'}); + $student_names=join(':',$env{'user.name'},$env{'user.domain'}, + $env{'request.course.sec'},$fullname). '_ENDPERSON_'.'_END_'; } } @@ -1380,7 +1424,7 @@ ENDPART 'cgi.'.$identifier.'.selection' => $selectionmade, 'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'}, 'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'}, - 'cgi.'.$identifier.'role' => $ENV{'request.role.adv'}, + 'cgi.'.$identifier.'role' => $env{'request.role.adv'}, 'cgi.'.$identifier.'numberoffiles' => $#print_array, 'cgi.'.$identifier.'studentnames' => $student_names, 'cgi.'.$identifier.'backref' => $URLback,); @@ -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) { @@ -1448,18 +1491,18 @@ sub print_resources { my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline); if (&Apache::lonnet::allowed('bre',$res_url)) { if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { - my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv); + my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv); my $lonidsdir=$r->dir_config('lonIDsDir'); - my $envfile=$ENV{'user.environment'}; + my $envfile=$env{'user.environment'}; $envfile=~/\/([^\/]+)\.id$/; $envfile=$1; &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile); - my $current_counter=$ENV{'form.counter'}; + my $current_counter=$env{'form.counter'}; if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { $moreenv->{'answer_output_mode'}='tex'; $moreenv->{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; - my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%{$moreenv}); + my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%{$moreenv}); &Apache::lonnet::appenv(('form.counter' => $current_counter)); if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; @@ -1477,13 +1520,13 @@ sub print_resources { } $current_output .= $rendered; } elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { - my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv); + my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv); my $lonidsdir=$r->dir_config('lonIDsDir'); - my $envfile=$ENV{'user.environment'}; + my $envfile=$env{'user.environment'}; $envfile=~/\/([^\/]+)\.id$/; $envfile=$1; &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile); - my $current_counter=$ENV{'form.counter'}; + my $current_counter=$env{'form.counter'}; if ($remove_latex_header eq 'YES') { $rendered = &latex_header_footer_remove($rendered); } else { @@ -1528,7 +1571,7 @@ sub handler { # if ($loaderror) { return $loaderror; } # $loaderror= # &Apache::lonnet::overloaderror($r, -# $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); +# $env{'course.'.$env{'request.course.id'}.'.home'}); # if ($loaderror) { return $loaderror; } my $result = printHelper($r); @@ -1541,12 +1584,12 @@ sub handler { # foreach $key (keys %{$helper->{'VARS'}}) { # $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-
'); # } -# foreach $key (keys %ENV) { -# $r->print(' '.$key.'->'.$ENV{$key}.'<-
'); +# foreach $key (keys %env) { +# $r->print(' '.$key.'->'.$env{$key}.'<-
'); # } # return OK; - my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'}); + my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'}); # my $key; # foreach $key (keys %parmhash) { @@ -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; } @@ -1575,7 +1625,7 @@ sub printHelper { my $r = shift; if ($r->header_only) { - if ($ENV{'browser.mathml'}) { + if ($env{'browser.mathml'}) { &Apache::loncommon::content_type($r,'text/xml'); } else { &Apache::loncommon::content_type($r,'text/html'); @@ -1585,7 +1635,7 @@ sub printHelper { } # Send header, nocache - if ($ENV{'browser.mathml'}) { + if ($env{'browser.mathml'}) { &Apache::loncommon::content_type($r,'text/xml'); } else { &Apache::loncommon::content_type($r,'text/html'); @@ -1609,29 +1659,51 @@ 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. # Detect whether we're coming from construction space - if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) { + if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) { $helper->{VARS}->{'filename'} = "~$1/$2"; $helper->{VARS}->{'construction'} = 1; } else { - if ($ENV{'form.postdata'}) { - $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'}); + if ($env{'form.postdata'}) { + $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'}); } - if ($ENV{'form.symb'}) { - $helper->{VARS}->{'symb'} = $ENV{'form.symb'}; + if ($env{'form.symb'}) { + $helper->{VARS}->{'symb'} = $env{'form.symb'}; } - if ($ENV{'form.url'}) { + if ($env{'form.url'}) { $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'}); } } - if ($ENV{'form.symb'}) { - $helper->{VARS}->{'symb'} = $ENV{'form.symb'}; + if ($env{'form.symb'}) { + $helper->{VARS}->{'symb'} = $env{'form.symb'}; } - if ($ENV{'form.url'}) { + if ($env{'form.url'}) { $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'}); } @@ -1663,17 +1735,17 @@ sub printHelper { } $subdir = &Apache::lonnet::filelocation("", $url); } - if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) { - $helper->{VARS}->{'curseed'}=$ENV{'form.curseed'}; + if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) { + $helper->{VARS}->{'curseed'}=$env{'form.curseed'}; } - if (!$helper->{VARS}->{'probstatus'} && $ENV{'form.problemtype'}) { - $helper->{VARS}->{'probstatus'}=$ENV{'form.problemtype'}; + if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) { + $helper->{VARS}->{'probstatus'}=$env{'form.problemtype'}; } my $userCanSeeHidden = Apache::lonnavmaps::advancedUser(); - my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or - $ENV{'request.role'}=~m/^in\./ or - $ENV{'request.role'}=~m/^ta\./); + my $userPriviledged = ($env{'request.role'}=~m/^cc\./ or + $env{'request.role'}=~m/^in\./ or + $env{'request.role'}=~m/^ta\./); Apache::lonhelper::registerHelperTags(); @@ -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;