loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.602 and 1.619

version 1.602, 2011/11/05 21:49:25	version 1.619, 2012/06/11 11:07:33
Line 1	Line 1

# The LearningOnline Network	# The LearningOnline Network
# Printout	# Printout
#	#
Line 28	Line 27
#	#
package Apache::lonprintout;	package Apache::lonprintout;
use strict;	use strict;
	use POSIX;
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http);
use Apache::lonxml;	use Apache::lonxml;
use Apache::lonnet;	use Apache::lonnet;
Line 41 use Apache::admannotations;	Line 41 use Apache::admannotations;
use Apache::lonenc;	use Apache::lonenc;
use Apache::entities;	use Apache::entities;
use Apache::londefdef;	use Apache::londefdef;
	# use Apache::structurelags; # for language management.

use File::Basename;	use File::Basename;

use HTTP::Response;	use HTTP::Response;
use LONCAPA::map();	use LONCAPA::map();
use POSIX qw(strftime);	use POSIX qw(ctime);
use Apache::lonlocal;	use Apache::lonlocal;
use Carp;	use Carp;
use LONCAPA;	use LONCAPA;
Line 76 my $font_size = 'normalsize'; # Default	Line 77 my $font_size = 'normalsize'; # Default

#---------------------------- Helper helpers. -------------------------	#---------------------------- Helper helpers. -------------------------

	##
	# Filter function to determine if a resource is a printable sequence.
	#
	# @param $res -Resource to check.
	#
	# @return 1 - printable and a resource
	# 0 - either notm a sequence or not printable.
	#
	sub printable_sequence {
	my $res = shift;

	# Non-sequences are not listed:

	if (!$res->is_sequence()) {
	return 0;
	}

	# Person with pav or pfo can always print:

	if ($perm{'pav'} \|\| $perm{'pfo'}) {
	return 1;
	}

	if ($res->is_sequence()) {
	my $symb = $res->symb();
	my $navmap = $res->{NAV_MAP};

	# Find the first resource in the map:

	my $iterator = $navmap->getIterator($res, undef, undef, 1, 1);
	my $first = $iterator->next();

	while (1) {
	if ($first == $iterator->END_ITERATOR) { last; }
	if (ref($first) && ! $first->is_sequence()) {last; }
	$first = $iterator->next();
	}


	# Might be an empty map:

	if (!ref($first)) {
	return 0;
	}
	my $partsref = $first->parts();
	my @parts = @$partsref;
	my ($open, $close) = $navmap->map_printdates($first, $parts[0]);
	return &printable($open, $close);
	}
	return 0;
	}

# BZ5209:	# BZ5209:
# Create the states needed to run the helper for incomplete problems from	# Create the states needed to run the helper for incomplete problems from
# the current folder for selected students.	# the current folder for selected students.
Line 302 CHOOSE_RESOURCES	Line 355 CHOOSE_RESOURCES
</resource>	</resource>
</state>	</state>
CHOOSE_RESOURCES	CHOOSE_RESOURCES

return $result;	return $result;
}	}
#	#
Line 435 RESOURCE_SELECTOR	Line 487 RESOURCE_SELECTOR

#-----------------------------------------------------------------------	#-----------------------------------------------------------------------

	# Computes an open and close date from a list of open/close dates for a resource's
	# parts.
	#
	# @param \@opens - reference to an array of open dates.
	# @param \@closes - reference to an array of close dates.
	#
	# @return ($open, $close)
	#
	# @note If open/close dates are not defined they will be retunred as undef
	# @note It is possible for there to be no overlap in which case -1,-1
	# will be returned.
	# @note The algorithm used is to take the latest open date and the earliest end date.
	#
	sub compute_open_window {
	my ($opensref, $closesref) = @_;

	my @opens = @$opensref;
	my @closes = @$closesref;

	# latest open date:
	my $latest_open;

	foreach my $open (@opens) {
	if (!defined($latest_open) \|\| ($open > $latest_open)) {
	$latest_open = $open;
	}
	}
	# Earliest close:

	my $earliest_close;
	foreach my $close (@closes) {
	if (!defined($earliest_close) \|\| ($close < $earliest_close)) {
	$earliest_close = $close;
	}
	}

	# If no overlap...both are -1 as promised.

	if (defined($earliest_close) && defined($latest_open)
	&& ($earliest_close < $latest_open)) {
	$latest_open = -1;
	$earliest_close = -1;
	}

	return ($latest_open, $earliest_close);

	}

	##
	# Determines if 'now' is within the set of printable dates.
	#
	# @param $open_date - Starting date/timestamp.
	# @param $close_date - Ending date/timestamp.
	#
	# @return 0 - Not open.
	# @return 1 - open.
	#
	sub printable {
	my ($open_date, $close_date) = @_;


	my $now = time();

	# Have to do a bit of fancy footwork around undefined open/close dates:

	if ($open_date && ($open_date > $now)) {
	return 0;
	}

	if ($close_date && ($close_date < $now)) {
	return 0;
	}

	return 1;

	}

	##
	# Returns the innermost print start/print end dates for a resource.
	# This is done by looking at the start/end dates for its parts and choosing
	# the intersection of those dates.
	#
	# @param res - lonnvamaps::resource object that represents the resource.
	#
	# @return (opendate, closedate)
	#
	# @note If open/close dates are not defined they will be retunred as undef
	# @note It is possible for there to be no overlap in which case -1,-1
	# will be returned.
	# @note The algorithm used is to take the latest open date and the earliest end date.
	#

	sub get_print_dates {
	my $res = shift;
	my $partsref = $res->parts();
	my @parts = @$partsref;
	my $open_date;
	my $close_date;
	my @open_dates;
	my @close_dates;


	if (defined(@parts) && (scalar(@parts) > 0)) {
	foreach my $part (@parts) {
	my $partopen = $res->parmval('printstartdate', $part);
	my $partclose = $res->parmval('printenddate', $part);

	push(@open_dates, $partopen);
	push(@close_dates, $partclose);
	}
	}

	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);

	if ($open_date) {
	$open_date = POSIX::strftime('%D', localtime($open_date));
	}
	if ($close_date) {
	$close_date = POSIX::strftime('%D', localtime($close_date));
	}

	return ($open_date, $close_date);
	}

	##
	# Get the dates for which a course says a resource can be printed. This is like
	# get_print_dates but namvaps::course_print_dates are gotten...and not converted
	# to times either.
	#
	# @param $res - Reference to a resource has from lonnvampas::resource.
	#
	# @return (opendate, closedate)
	#
	sub course_print_dates {
	my $res = shift;
	my $partsref = $res->parts();
	my @parts = @$partsref;
	my $open_date;
	my $close_date;
	my @open_dates;
	my @close_dates;
	my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.

	# Don't bother looping over undefined or empty parts arraY;

	if (defined(@parts) && (scalar(@parts) > 0)) {
	foreach my $part (@parts) {
	my ($partopen, $partclose) = $navmap->course_printdates($res, $part);
	push(@open_dates, $partopen);
	push(@close_dates, $partclose);
	}
	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
	}
	return ($open_date, $close_date);
	}
	##
	# Same as above but for the enclosing map:
	#
	sub map_print_dates {
	my $res = shift;
	my $partsref = $res->parts();
	my @parts = @$partsref;
	my $open_date;
	my $close_date;
	my @open_dates;
	my @close_dates;
	my $navmap = $res->{NAV_MAP}; # slightly OO dirty.


	# Don't bother looping over undefined or empty parts arraY;

	if (defined(@parts) && (scalar(@parts) > 0)) {
	foreach my $part (@parts) {
	my ($partopen, $partclose) = $navmap->map_printdates($res, $part);
	push(@open_dates, $partopen);
	push(@close_dates, $partclose);
	}
	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
	}
	return ($open_date, $close_date);
	}

# Determine if a resource is incomplete given the map:	# Determine if a resource is incomplete given the map:
# Parameters:	# Parameters:
# $username - Name of user for whom we are checking.	# $username - Name of user for whom we are checking.
Line 519 sub master_seq_to_person_seq {	Line 753 sub master_seq_to_person_seq {
# Only process resources..that are not removed by randomout...	# Only process resources..that are not removed by randomout...
# and are selected for printint as well.	# and are selected for printint as well.
#	#

if (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {	if (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {
my $symb = $curres->symb();	my $symb = $curres->symb();
if (exists $seq_hash{$symb}) {	if (exists $seq_hash{$symb}) {
Line 634 sub include_pdf {	Line 869 sub include_pdf {
# (unlikely). If it did exist, add the pdf to the set of files/images that	# (unlikely). If it did exist, add the pdf to the set of files/images that
# need tob e converted for this print job:	# need tob e converted for this print job:

$file =~ s\|(.*)/res/\|/home/httpd/html/res/\|;	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
	$file =~ s{(.*)/res/}{$londocroot/res/};

open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");	open(FILE,">>$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
print FILE ("$file\n");	print FILE ("$file\n");
close (FILE);	close (FILE);

Line 659 sub include_pdf {	Line 895 sub include_pdf {


}	}
	##
	# Collect the various \select_language{language_name}
	# latex tags to build a \usepackage[lang-list]{babel} which will
	# appear just prior to the \begin{document} at the front of the concatenated
	# set of resources:
	# @param doc - The string of latex to search/replace.
	# @return string
	# @retval - the modified document stringt.
	#
	sub collect_languages {
	my $doc = shift;
	my %languages;
	while ($doc =~ /\\selectlanguage{(\w+)}/mg) {
	$languages{$1} = 1; # allows us to request each language exactly once.
	}
	my @lang_list = (keys(%languages)); # List of unique languages
	if (scalar @lang_list) {
	my $babel_header = '\usepackage[' . join(',', @lang_list) .']{babel}'. "\n";
	$doc =~ s/\\begin{document}/$babel_header\\begin{document}/;
	}
	return $doc;
	}
	#-------------------------------------------------------------------

#	#
# ssi_with_retries- Does the server side include of a resource.	# ssi_with_retries- Does the server side include of a resource.
Line 975 sub is_code_valid {	Line 1233 sub is_code_valid {
}	}

}	}
	#
	# Compare two students by section (Used to sort by section).
	#
	# Implicit inputs,
	# $a - The first one
	# $b - The second one.
	#
	# Returns:
	# a-section cmp b-section
	#
	sub compare_sections {
	my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
	my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);

	return $s1 cmp $s2;
	}

# Compare two students by name. The students are in the form	# Compare two students by name. The students are in the form
# returned by the helper:	# returned by the helper:
Line 2051 sub recently_generated {	Line 2325 sub recently_generated {
# A reference to a page break hash.	# A reference to a page break hash.
#	#
#	#
use Data::Dumper;	# use Data::Dumper;
# sub dump_helper_vars {	# sub dump_helper_vars {
# my ($helper) = @_;	# my ($helper) = @_;
# my $helpervars = Dumper($helper->{'VARS'});	# my $helpervars = Dumper($helper->{'VARS'});
Line 2200 sub set_form_extraspace {	Line 2474 sub set_form_extraspace {
sub print_construction_sequence {	sub print_construction_sequence {
my ($currentURL, $helper, %form, $LaTeXwidth) = @_;	my ($currentURL, $helper, %form, $LaTeXwidth) = @_;


my $result;	my $result;
my $rndseed=time;	my $rndseed=time;
if ($helper->{'VARS'}->{'curseed'}) {	if ($helper->{'VARS'}->{'curseed'}) {
$rndseed=$helper->{'VARS'}->{'curseed'};	$rndseed=$helper->{'VARS'}->{'curseed'};
}	}
my $errtext=&LONCAPA::map::mapread($currentURL);	my $errtext=&LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$currentURL));

#	#
# These make this all support recursing for subsequences.	# These make this all support recursing for subsequences.
#	#
my @order = @LONCAPA::map::order;	my @order = @LONCAPA::map::order;
my @resources = @LONCAPA::map::resources;	my @resources = @LONCAPA::map::resources;

for (my $member=0;$member<=$#order;$member++) {	for (my $member=0;$member<=$#order;$member++) {
$resources[$order[$member]]=~/^([^:]):([^:]):/;	$resources[$order[$member]]=~/^([^:]):([^:]):/;
my $urlp=$2;	my $urlp=$2;
Line 2227 sub print_construction_sequence {	Line 2502 sub print_construction_sequence {
}	}
if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|	if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&	($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
($urlp=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page)$/)) {	($urlp=~/$LONCAPA::assess_page_re/)) {
# Don't permanently modify %$form...	# Don't permanently modify %$form...
my %answerform = %form;	my %answerform = %form;
$answerform{'grade_target'}='answer';	$answerform{'grade_target'}='answer';
Line 2271 sub print_construction_sequence {	Line 2546 sub print_construction_sequence {
# IF sequence, recurse:	# IF sequence, recurse:

if ($urlp =~ /\.sequence$/) {	if ($urlp =~ /\.sequence$/) {
#	$result .= &print_construction_sequence($urlp,
# FIXME: this does not work for co-authors
my $sequence_url = $urlp;
my $domain = $env{'user.domain'}; # Constr. space only on local
my $user = $env{'user.name'};
# FIXME: the substitutions below do not seem to make sense

$sequence_url =~ s/^\/res\/$domain/\/home/;
$sequence_url =~ s/^(\/home\/$user)/$1\/public_html/;
# $sequence_url =~ s\|\/~([^\/]+)\/\|\/home\/$1\/public_html\/\|;
$result .= &print_construction_sequence($sequence_url,
$helper, %form,	$helper, %form,
$LaTeXwidth);	$LaTeXwidth);
}	}
Line 2338 sub print_construction_sequence {	Line 2603 sub print_construction_sequence {

sub output_data {	sub output_data {
my ($r,$helper,$rparmhash) = @_;	my ($r,$helper,$rparmhash) = @_;

my %parmhash = %$rparmhash;	my %parmhash = %$rparmhash;
$ssi_error = 0; # This will be set nonzero by failing ssi's.	$ssi_error = 0; # This will be set nonzero by failing ssi's.
$resources_printed = '';	$resources_printed = '';
Line 2555 ENDPART	Line 2819 ENDPART
}	}
} elsif ($cleanURL!~m\|^/adm/\|	} elsif ($cleanURL!~m\|^/adm/\|
&& $currentURL=~/\.(sequence\|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {	&& $currentURL=~/\.(sequence\|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
#printing content of sequence from the construction space

# FIXME: unclear how this would work

$currentURL=~s\|\/~([^\/]+)\/\|\/home\/$1\/public_html\/\|;
$result .= &print_construction_sequence($currentURL, $helper, %form,	$result .= &print_construction_sequence($currentURL, $helper, %form,
$LaTeXwidth);	$LaTeXwidth);
$result .= '\end{document}';	$result .= '\end{document}';
Line 2721 ENDPART	Line 2980 ENDPART
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;	$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
}	}
} else {	} else {
if ($urlp=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page)$/) {	if ($urlp=~/$LONCAPA::assess_page_re/) {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});	$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
# $texversion =~ s/\\begin{document}//; # FIXME	# $texversion =~ s/\\begin{document}//; # FIXME
my $title = &Apache::lonnet::gettitle($master_seq[$i]);	my $title = &Apache::lonnet::gettitle($master_seq[$i]);
Line 2759 ENDPART	Line 3018 ENDPART
$assignment,	$assignment,
$courseidinfo,	$courseidinfo,
$name);	$name);

if ($numberofcolumns eq '1') {	if ($numberofcolumns eq '1') {
$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';	$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
} else {	} else {
Line 2860 ENDPART	Line 3118 ENDPART
if (($helper->{'VARS'}->{'student_sort'} eq 1) &&	if (($helper->{'VARS'}->{'student_sort'} eq 1) &&
($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {	($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
@students = sort compare_names @students;	@students = sort compare_names @students;
	} else {
	@students = sort compare_sections @students;
}	}
&adjust_number_to_print($helper);	&adjust_number_to_print($helper);

Line 2892 ENDPART	Line 3152 ENDPART
($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {	($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
$moreenv{'problem_split'}='yes';	$moreenv{'problem_split'}='yes';
}	}
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$#students+1);
my $student_counter=-1;	my $student_counter=-1;
my $i = 0;	my $i = 0;
my $last_section = (split(/:/,$students[0]))[2];	my $last_section = (split(/:/,$students[0]))[2];
Line 3007 ENDPART	Line 3267 ENDPART
$number_per_page=$num_todo > 0 ? $num_todo : 1;	$number_per_page=$num_todo > 0 ? $num_todo : 1;
}	}
my $flag_latex_header_remove = 'NO';	my $flag_latex_header_remove = 'NO';
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');	my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);
my $count=0;	my $count=0;
foreach my $code (sort(@allcodes)) {	foreach my $code (sort(@allcodes)) {
my $file_num=int($count/$number_per_page);	my $file_num=int($count/$number_per_page);
Line 3049 ENDPART	Line 3309 ENDPART
if ($urlp=~/\//) {	if ($urlp=~/\//) {
$form{'problem_split'}=$parmhash{'problem_stream_switch'};	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'rndseed'}=$rndseed;	$form{'rndseed'}=$rndseed;
if ($urlp =~ m\|/home/([^/]+)/public_html\|) {	$urlp =~ s\|^$Apache::lonnet::perlvar{'lonDocRoot'}\|\|;
$urlp =~ s\|/home/([^/]*)/public_html\|/~$1\|;
} else {
$urlp =~ s\|^$Apache::lonnet::perlvar{'lonDocRoot'}\|\|;
}
$resources_printed .= $urlp.':';	$resources_printed .= $urlp.':';
my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);	my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|	if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') \|\|
Line 3074 ENDPART	Line 3330 ENDPART
$texversion.='\vskip 0 mm \noindent ';	$texversion.='\vskip 0 mm \noindent ';
$texversion.=&path_to_problem ($urlp,$LaTeXwidth);	$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
} else {	} else {
$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';	$texversion.='\vskip 0 mm \noindent\textbf{'.
my $URLpath=$urlp;	&mt("Printing from Construction Space: No Title").'}\vskip 0 mm ';
$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;	$texversion.=&path_to_problem ($urlp,$LaTeXwidth);
$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
}	}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';	$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}	}
}	}
#this chunk is responsible for printing the path to problem	#this chunk is responsible for printing the path to problem

my $newurlp=$urlp;	my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
if ($newurlp=~/~/) {$newurlp=~s\|\/~([^\/]+)\/\|\/home\/$1\/public_html\/\|;}
$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;	$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
if ($flag_latex_header_remove ne 'NO') {	if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);	$texversion = &latex_header_footer_remove($texversion);
Line 3135 ENDPART	Line 3388 ENDPART

my $URLback=''; #link to original document	my $URLback=''; #link to original document
if ($helper->{'VARS'}->{'construction'} eq '1') {	if ($helper->{'VARS'}->{'construction'} eq '1') {
#prints resource from the construction space	$URLback=$helper->{'VARS'}->{'filename'};
$URLback='/'.$helper->{'VARS'}->{'filename'};
if ($URLback=~/([^?]+)/) {
$URLback=$1;
$URLback=~s\|^/~\|/priv/\|;
}
}	}
#	#
# Final adjustment of the font size:	# Final adjustment of the font size:
Line 3148 ENDPART	Line 3396 ENDPART

$result = set_font_size($result);	$result = set_font_size($result);

	# Insert any babel headers required.

	$result = &collect_languages($result);


#-- writing .tex file in prtspool	#-- writing .tex file in prtspool
my $temp_file;	my $temp_file;
my $identifier = &Apache::loncommon::get_cgi_id();	my $identifier = &Apache::loncommon::get_cgi_id();
Line 3276 sub print_resources {	Line 3529 sub print_resources {
my $fullname = &get_name($username,$userdomain);	my $fullname = &get_name($username,$userdomain);
my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.	my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.



#	#
# Figure out if we need to filter the output by	# Figure out if we need to filter the output by
# the incomplete problems for that person	# the incomplete problems for that person
Line 3287 sub print_resources {	Line 3542 sub print_resources {
$print_incomplete = 1;	$print_incomplete = 1;
}	}
if ($person eq 'anonymous') {	if ($person eq 'anonymous') {
$namepostfix .="Name: ";	$namepostfix .=&mt('Name:')." ";
$fullname = "CODE - ".$moreenv->{'CODE'};	$fullname = "CODE - ".$moreenv->{'CODE'};
}	}

Line 3314 sub print_resources {	Line 3569 sub print_resources {
#	#

my $syllabus_first = 0;	my $syllabus_first = 0;
	my $current_assignment = "";
	my $assignment;
	my $courseidinfo = &get_course();

foreach my $curresline (@{$master_seq}) {	foreach my $curresline (@{$master_seq}) {
if (defined $page_breaks{$curresline}) {	if (defined $page_breaks{$curresline}) {
if($i != 0) {	if($i != 0) {
Line 3322 sub print_resources {	Line 3581 sub print_resources {
}	}
$current_output .= &get_extra_vspaces($helper, $curresline);	$current_output .= &get_extra_vspaces($helper, $curresline);
$i++;	$i++;
	my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);

	# See if we need to emit a new header:

if ( !($type eq 'problems' &&	if ( !($type eq 'problems' &&
($curresline!~ m/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|page)$/)) ) {	($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {	if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
next;	next;
}	}
Line 3428 sub print_resources {	Line 3690 sub print_resources {
}	}
$remove_latex_header = 'YES';	$remove_latex_header = 'YES';
}	}
	$assignment = &Apache::lonxml::latex_special_symbols(
	&Apache::lonnet::gettitle($map), 'header');
	if (($assignment ne $current_assignment) && ($assignment ne "")) {
	my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
	$assignment, $courseidinfo,
	$fullname, $usersection);
	my $header_start = ($columns_in_format == 1) ? '\lhead'
	: '\fancyhead[LO]';
	$header_line = $header_start.'{'.$header_line.'}';
	$current_output = $current_output . $header_line;
	$current_assignment = $assignment;
	}

if (&Apache::loncommon::connection_aborted($r)) { last; }	if (&Apache::loncommon::connection_aborted($r)) { last; }
}	}
# If we are printing incomplete it's possible we don't have	# If we are printing incomplete it's possible we don't have
Line 3448 sub print_resources {	Line 3723 sub print_resources {
if ($syllabus_first) {	if ($syllabus_first) {
$current_output =~ s/\\\\ Last updated:/Last updated:/	$current_output =~ s/\\\\ Last updated:/Last updated:/
}	}
my $courseidinfo = &get_course();	if (0) {
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');	my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
my $header_line =	my $header_line =
&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
$currentassignment, $courseidinfo, $fullname, $usersection);	$currentassignment, $courseidinfo, $fullname, $usersection);
my $header_start = ($columns_in_format == 1) ? '\lhead'	my $header_start = ($columns_in_format == 1) ? '\lhead'
: '\fancyhead[LO]';	: '\fancyhead[LO]';
$header_line = $header_start.'{'.$header_line.'}';	$header_line = $header_start.'{'.$header_line.'}';
	}
if ($current_output=~/\\documentclass/) {	if ($current_output=~/\\documentclass/) {
$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;	# $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$namepostfix}\\vskip 5 mm /;

} else {	} else {
my $blankpages =	my $blankpages =
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};	'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};

	# $current_output = '\strut\vspace*{-6 mm}\\newline'.
	# &copyright_line().' \newpage '.$blankpages.$end_of_student.
	# '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
	# $header_line.$namepostfix. '} \vskip 5 mm '.$current_output;
$current_output = '\strut\vspace*{-6 mm}\\newline'.	$current_output = '\strut\vspace*{-6 mm}\\newline'.
&copyright_line().' \newpage '.$blankpages.$end_of_student.	&copyright_line().' \newpage '.$blankpages.$end_of_student.
'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.	'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'
$header_line.$namepostfix.'} \vskip 5 mm '.$current_output;	.$namepostfix. '} \vskip 5 mm '.$current_output;

}	}
#	#
# Close the student bracketing.	# Close the student bracketing.
Line 3474 sub print_resources {	Line 3757 sub print_resources {

}	}

	sub printing_blocked {
	my ($r,$blocktext) = @_;
	my $title = &mt('Preparing Printout');
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/printout',
	text=> $title});
	my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs($title);
	&Apache::loncommon::content_type($r,'text/html');
	&Apache::loncommon::no_cache($r);
	$r->send_http_header;
	$r->print(&Apache::loncommon::start_page('Preparing Printout').
	$breadcrumbs.
	$blocktext.
	&Apache::loncommon::end_page());
	return;
	}

sub handler {	sub handler {

my $r = shift;	my $r = shift;

	if ($env{'request.course.id'}) {
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my ($blocked,$blocktext) =
	&Apache::loncommon::blocking_status('printout',$cnum,$cdom);
	if ($blocked) {
	my $checkrole = "cm./$cdom/$cnum";
	if ($env{'request.course.sec'} ne '') {
	$checkrole .= "/$env{'request.course.sec'}";
	}
	unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
	($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
	&printing_blocked($r,$blocktext);
	return OK;
	}
	}
	}

&init_perm();	&init_perm();

Line 3503 sub handler {	Line 3821 sub handler {

&output_data($r,$helper,\%parmhash);	&output_data($r,$helper,\%parmhash);
return OK;	return OK;
}	}

use Apache::lonhelper;	use Apache::lonhelper;

Line 3548 sub get_randomly_ordered_warning {	Line 3866 sub get_randomly_ordered_warning {
my $func =	my $func =
sub { return ($_[0]->is_map() && $_[0]->randomorder); };	sub { return ($_[0]->is_map() && $_[0]->randomorder); };
my @matches = $navmap->retrieveResources($res, $func,1,1,1);	my @matches = $navmap->retrieveResources($res, $func,1,1,1);
if (@matches) {
$message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
}
}
if ($message) {
return '<message type="warning">'.$message.'</message>';
}	}
} else {	} else {
$message = "Retrieval of information about ordering of resources failed.";	$message = "Retrieval of information about ordering of resources failed.";
Line 3682 sub printHelper {	Line 3995 sub printHelper {
my $is_published=0; # True when printing from resource space.	my $is_published=0; # True when printing from resource space.
my $res_printable = 1; # By default the current resource is printable.	my $res_printable = 1; # By default the current resource is printable.
my $userCanPrint = ($perm{'pav'} \|\| $perm{'pfo'});	my $userCanPrint = ($perm{'pav'} \|\| $perm{'pfo'});
	my $res_printstartdate;
	my $res_printenddate;
	my $map_open = 0;
	my $map_close = 0xffffffff;
	my $course_open = 0;
	my $course_close = 0xffffffff;

# Get the resource name from construction space	# Get the resource name from construction space
if ($helper->{VARS}->{'construction'}) {	if ($helper->{VARS}->{'construction'}) {
Line 3698 sub printHelper {	Line 4017 sub printHelper {
&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));	&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my $res = $navmap->getBySymb($symb);	my $res = $navmap->getBySymb($symb);
$res_printable = $res->resprintable() \|\| $userCanPrint; #printability in course context	$res_printable = $res->resprintable() \| $userCanPrint; #printability in course context
	($res_printstartdate, $res_printenddate) = &get_print_dates($res);
	($course_open, $course_close) = &course_print_dates($res);
	($map_open, $map_close) = &map_print_dates($res);

} else {	} else {
# Resource space.	# Resource space.

Line 3717 sub printHelper {	Line 4040 sub printHelper {
if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {	if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
$helper->{VARS}->{'curseed'}=$env{'form.curseed'};	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
}	}

if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {	if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};	$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
}	}
Line 3747 sub printHelper {	Line 4071 sub printHelper {

if ($resourceTitle && $res_printable) {	if ($resourceTitle && $res_printable) {
push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];	push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
}	}


# Useful filter strings	# Useful filter strings

Line 3853 sub printHelper {	Line 4176 sub printHelper {
my $nextState = 'CHOOSE_INCOMPLETE_SEQ';	my $nextState = 'CHOOSE_INCOMPLETE_SEQ';
my $textSuffix = '';	my $textSuffix = '';

if ($userCanPrint) {	if ($userCanPrint) {
$printSelector = 'map_incomplete_problems_people_seq';	$printSelector = 'map_incomplete_problems_people_seq';
$nextState = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';	$nextState = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';
$textSuffix = ' for selected students';	$textSuffix = ' for selected students';
Line 3861 sub printHelper {	Line 4184 sub printHelper {
&create_incomplete_folder_selstud_helper($helper, $map);	&create_incomplete_folder_selstud_helper($helper, $map);
&Apache::lonxml::xmlparse($r, 'helper', $helperStates);	&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
} else {	} else {
my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.	if (&printable($map_open, $map_close)) {
&Apache::lonxml::xmlparse($r, 'helper', $helperStates);	my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
	&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
	} else {
	# TODO: Figure out how to break the news...this folder is not printable.
	}
}	}

push(@{$printChoices},	if ($userCanPrint \|\| &printable($map_open, $map_close)) {
[&mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,	push(@{$printChoices},
'<b>', '</b>',	[&mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
'<b><i>'. $sequenceTitle . '</b></i>'),	'<b>', '</b>',
$printSelector,	'<b><i>'. $sequenceTitle . '</b></i>'),
$nextState]);	$printSelector,
	$nextState]);
	}
# Allow problems from sequence	# Allow problems from sequence
push @{$printChoices},	if ($userCanPrint \|\| &printable($map_open, $map_close)) {
	push @{$printChoices},
[&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),	[&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
'map_problems',	'map_problems',
'CHOOSE_PROBLEMS'];	'CHOOSE_PROBLEMS'];
# Allow all resources from sequence	# Allow all resources from sequence
push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),	push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
'map_problems_pages',	'map_problems_pages',
'CHOOSE_PROBLEMS_HTML'];	'CHOOSE_PROBLEMS_HTML'];
my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',	my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
'Select Problem(s) to print',	'Select Problem(s) to print',
'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',	'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
'RESOURCES',	'RESOURCES',
'PAGESIZE',	'PAGESIZE',
$map,	$map,
$isProblem, '',	! $isProblem, '',
$symbFilter,	$symbFilter,
$start_new_option);	$start_new_option);
$helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',	$helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
'Select Resource(s) to print',	'Select Resource(s) to print',
'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',	'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
'RESOURCES',	'RESOURCES',
'PAGESIZE',	'PAGESIZE',
$map,	$map,
$isNotMap, '',	$isNotMap, '',
$symbFilter,	$symbFilter,
$start_new_option);	$start_new_option);

&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
	} else {
	# TODO: Figure out how to tell them the folder is not printable.
	}
}	}
	# If the user has pfo (print for others) allow them to print all
# If the user has pfo (print for others) allow them to print all	# problems and resources in the entire course, optionally for selected students
# problems and resources in the entire course, optionally for selected students	my $post_data = $helper->{VARS}->{'postdata'};
my $post_data = $helper->{VARS}->{'postdata'};

if ($perm{'pfo'} && !$is_published &&	if ($perm{'pfo'} && !$is_published &&
($post_data=~/\/res\// \|\| $post_data =~/\/(syllabus\|smppg\|aboutme\|bulletinboard)$/)) {	($post_data=~/\/res\// \|\| $post_data =~/\/(syllabus\|smppg\|aboutme\|bulletinboard)$/)) {
Line 4268 CHOOSE_FROM_SUBDIR	Line 4599 CHOOSE_FROM_SUBDIR
<message>Select the sequence to print resources from:</message>	<message>Select the sequence to print resources from:</message>
<resource variable="SEQUENCE">	<resource variable="SEQUENCE">
<nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>	<nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
<filterfunc>return \$res->is_sequence;</filterfunc>	<filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
<valuefunc>return $urlValue;</valuefunc>	<valuefunc>return $urlValue;</valuefunc>
<choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);	<choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
</choicefunc>	</choicefunc>
Line 4290 CHOOSE_FROM_ANY_SEQUENCE	Line 4621 CHOOSE_FROM_ANY_SEQUENCE

# Generate the first state, to select which resources get printed.	# Generate the first state, to select which resources get printed.
Apache::lonhelper::state->new("START", "Select Printing Options:");	Apache::lonhelper::state->new("START", "Select Printing Options:");
	if (!$res_printable) {
	$paramHash = Apache::lonhelper::getParamHash();
	$paramHash->{MESSAGE_TEXT} =
	&mt('<p><b>Printing for current resource is only possible between [_1] and [_1]</b></p>',
	$res_printstartdate, $res_printenddate);
	Apache::lonhelper::message->new();
	}
	$paramHash = Apache::lonhelper::getParamHash();
$paramHash = Apache::lonhelper::getParamHash();	$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{MESSAGE_TEXT} = "";	$paramHash->{MESSAGE_TEXT} = "";
Apache::lonhelper::message->new();	Apache::lonhelper::message->new();
Line 4932 sub postprocess {	Line 5271 sub postprocess {
}	}
}	}



__END__	__END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.602
changed lines
	Added in v.1.619